diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/apiVisitStat.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/apiVisitStat.ftl index 4f5ec9781..93a24eb3f 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/apiVisitStat.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/apiVisitStat.ftl @@ -579,7 +579,7 @@ <#if way==1> ${bo.key!} <#else> - ${bo.key!} + ${bo.key!} <#if way?? && way==1> @@ -787,7 +787,6 @@ function submitForm(action) { const form = document.getElementById('myForm'); if (action === 'query') { - debugger form.action = "<#if way?? && way==0>../apiUser/pandect<#else>../apiUser/apiVisitStat"; } else if (action === 'download') { form.action = "../apiUser/export"; diff --git a/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl b/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl index 1275224a6..f38b9b079 100644 --- a/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/apiUser/list.ftl @@ -52,25 +52,25 @@
diff --git a/projects/fangjia-bkoff/src/main/webapp/layout/menu.ftl b/projects/fangjia-bkoff/src/main/webapp/layout/menu.ftl index 2b326e80e..da9cec860 100644 --- a/projects/fangjia-bkoff/src/main/webapp/layout/menu.ftl +++ b/projects/fangjia-bkoff/src/main/webapp/layout/menu.ftl @@ -295,7 +295,7 @@ <@menuitem uri='/creditRate/list' text="ä»·æ ¼å�¯ä¿¡åº¦ä¸ŽåŒ¹é…�率关系" /> <@menuitem uri='/czBank/sampleLogs' text="浙商银行" /> <@menuitem uri='/villageIdentify/importResult' text="涉农结果导入" /> - <@menuitem uri='/apiCountLog/list' text="API次数日志" /> + <@menuitem uri='/apiCountLog/list?purpose=1&isTest=0&status=0' text="API次数日志" /> diff --git a/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl b/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl index 375d1ec56..57168fb3d 100644 --- a/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl +++ b/projects/fangjia-coresite/src/main/webapp/trend/trend.ftl @@ -406,10 +406,10 @@ const month = now.getMonth() + 1; // 月 let divElement = document.getElementById("date"); - divElement.innerHTML = ""+year+"å¹´"+month+"月"+""; + $("#date").html(""+year+"å¹´"+month+"月"+"") let divElement2 = document.getElementById("date2"); - divElement2.innerHTML = ""+year+"å¹´"+month+"月"+""; + $("#date2").html(""+year+"å¹´"+month+"月"+"") $(function(){ $('.td04').each(function(i){ 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 9893c6e7c..6b669977b 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 @@ -177,7 +177,7 @@ public class AddrSvcController { try { json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/structureAndComplete", params, "UTF-8"); if (json != null) { - int code = json.getInt("status"); + int code = json.getInt("status") == 0 ? 200 : 0; String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); if (json.containsKey("result")) { @@ -271,10 +271,11 @@ public class AddrSvcController { public Object suggestionAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); - if (StringUtils.isBlank(model.getCity())) { - mav.setModel(BasicModel.buildBadRequestModel("³ÇÊв»ÄÜΪ¿Õ")); - return mav; - } + // ³ÇÊиÄΪ·Ç±ØÌî +// if (StringUtils.isBlank(model.getCity())) { +// mav.setModel(BasicModel.buildBadRequestModel("³ÇÊв»ÄÜΪ¿Õ")); +// return mav; +// } if (StringUtils.isBlank(model.getKeywords())) { mav.setModel(BasicModel.buildBadRequestModel("¹Ø¼ü×Ö²»ÄÜΪ¿Õ")); return mav; @@ -311,6 +312,46 @@ public class AddrSvcController { return mav; } + /** + * µØÖ·ÁªÏë + */ + public Object tipsAction(AddressModel model) { + + RestfulModelAndView mav = new RestfulModelAndView(); + if (StringUtils.isBlank(model.getKeywords())) { + mav.setModel(BasicModel.buildBadRequestModel("ËÑË÷¹Ø¼ü×Ö²»ÄÜΪ¿Õ")); + return mav; + } + + HttpRequest request = new HttpRequest(); + JSONObject json = null; + Map params = new HashMap(); + params.put("keywords", model.getKeywords()); + params.put("city", StringUtils.isNotBlank(model.getCity()) ? model.getCity() : ""); + params.put("max", model.getMax() != 0 ? String.valueOf(model.getMax()) : ""); + try { + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/tips", params, "UTF-8"); + if (json != null) { + int code = json.getInt("msgCode"); + String msg = json.getString("msg"); + BasicModel basicModel = new BasicModel(code, msg); + if (json.containsKey("result")) { + JSONArray jsonArray = json.getJSONArray("result"); + if (jsonArray.size() > 0) { + basicModel.setResult(jsonArray); + } + } + mav.setModel(basicModel); + } else { + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); + } + } catch (Exception e) { + e.printStackTrace(); + mav.setModel(BasicModel.buildServerErrorModel().setMsg("·þÎñÉý¼¶ÖÐ...")); + } + return mav; + } + public Object avgPriceAction(AddressModel model) { RestfulModelAndView mav = new RestfulModelAndView(); if (StringUtils.isBlank(model.getAddress())) { @@ -1047,11 +1088,21 @@ public class AddrSvcController { for (Object o : jsonArray) { JSONObject result = (JSONObject) o; HashMap map = new HashMap(); - map.put("id", result.getString("id")); - map.put("province", result.getString("province")); - map.put("provinceCode", result.getString("tjjProvinceCode")); - map.put("city", result.getString("city")); - map.put("cityCode", result.getString("tjjCityCode")); + if (result.containsKey("id")) { + map.put("id", result.getString("id")); + } + if (result.containsKey("province")) { + map.put("province", result.getString("province")); + } + if (result.containsKey("provinceCode")) { + map.put("provinceCode", result.getString("tjjProvinceCode")); + } + if (result.containsKey("city")) { + map.put("city", result.getString("city")); + } + if (result.containsKey("cityCode")) { + map.put("cityCode", result.getString("tjjCityCode")); + } list.add(map); } } @@ -1095,9 +1146,15 @@ public class AddrSvcController { for (Object o : jsonArray) { JSONObject result = (JSONObject) o; HashMap map = new HashMap(); - map.put("id", result.getString("id")); - map.put("province", result.getString("province")); - map.put("provinceCode", result.getString("mzbProvinceCode")); + if (result.containsKey("id")) { + map.put("id", result.getString("id")); + } + if (result.containsKey("province")) { + map.put("province", result.getString("province")); + } + if (result.containsKey("provinceCode")) { + map.put("provinceCode", result.getString("mzbProvinceCode")); + } list.add(map); } } @@ -1144,13 +1201,27 @@ public class AddrSvcController { for (Object o : jsonArray) { JSONObject result = (JSONObject) o; HashMap map = new HashMap(); - map.put("id", result.getString("id")); - map.put("province", result.getString("province")); - map.put("provinceCode", result.getString("tjjProvinceCode")); - map.put("city", result.getString("city")); - map.put("cityCode", result.getString("tjjCityCode")); - map.put("district", result.getString("district")); - map.put("districtCode", result.getString("tjjDistrictCode")); + if (result.containsKey("id")) { + map.put("id", result.getString("id")); + } + if (result.containsKey("province")) { + map.put("province", result.getString("province")); + } + if (result.containsKey("provinceCode")) { + map.put("provinceCode", result.getString("tjjProvinceCode")); + } + if (result.containsKey("city")) { + map.put("city", result.getString("city")); + } + if (result.containsKey("cityCode")) { + map.put("cityCode", result.getString("tjjCityCode")); + } + if (result.containsKey("district")) { + map.put("district", result.getString("district")); + } + if (result.containsKey("districtCode")) { + map.put("districtCode", result.getString("tjjDistrictCode")); + } list.add(map); } } @@ -1192,15 +1263,33 @@ public class AddrSvcController { for (Object o : jsonArray) { JSONObject result = (JSONObject) o; HashMap map = new HashMap(); - map.put("id", result.getString("id")); - map.put("province", result.getString("province")); - map.put("provinceCode", result.getString("tjjProvinceCode")); - map.put("city", result.getString("city")); - map.put("cityCode", result.getString("tjjCityCode")); - map.put("district", result.getString("district")); - map.put("districtCode", result.getString("tjjDistrictCode")); - map.put("street", result.getString("street")); - map.put("streetCode", result.getString("tjjStreetCode")); + if (result.containsKey("id")) { + map.put("id", result.getString("id")); + } + if (result.containsKey("province")) { + map.put("province", result.getString("province")); + } + if (result.containsKey("provinceCode")) { + map.put("provinceCode", result.getString("tjjProvinceCode")); + } + if (result.containsKey("city")) { + map.put("city", result.getString("city")); + } + if (result.containsKey("cityCode")) { + map.put("cityCode", result.getString("tjjCityCode")); + } + if (result.containsKey("district")) { + map.put("district", result.getString("district")); + } + if (result.containsKey("districtCode")) { + map.put("districtCode", result.getString("tjjDistrictCode")); + } + if (result.containsKey("street")) { + map.put("street", result.getString("street")); + } + if (result.containsKey("streetCode")) { + map.put("streetCode", result.getString("tjjStreetCode")); + } list.add(map); } } 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 f036e2232..a484fd8cf 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 @@ -2277,7 +2277,7 @@ public class AddressController { } if (json != null) { - int code = json.getInt("status"); + int code = json.getInt("status") == 0 ? 200 : 0; String msg = json.getString("msg"); BasicModel basicModel = new BasicModel(code, msg); if (json.containsKey("result")) { 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 fd1709bf3..304f4813b 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 @@ -50,6 +50,44 @@ public class GdBankController { } }; + /** + * ÅжÏËùÊôÇøÓò + * + * @param map + * @return + */ + public String addrArea(Map map, String type) { + if (map.get("verifyFlag") == null) { + return ""; + } + if (map.get("verifyFlag").equals("·ÇÅ©")) { + return "³ÇÊÐÇøÓò"; + } + if (map.get("verifyFlag").equals("Å©")) { + 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").equals("¶«Ý¸ÊÐ") || map.get("city").equals("¼ÎÓø¹ØÊÐ") || map.get("city").equals("ÖÐɽÊÐ") || map.get("city").equals("ÙÙÖÝÊÐ")) { + return "·ñ"; + } + return "ÊÇ"; + } + /** * ÉæÅ©Ê¶±ð-йæÔò-¹â´óÒøÐÐ * @@ -90,22 +128,16 @@ public class GdBankController { if (json.containsKey("result")) { //ÎÒÃǵĽá¹û JSONObject result = json.getJSONObject("result"); - if (("ÊÇ").equals(result.get("countyLevelCity"))) { - result.put("prefectureLevelCity", "·ñ"); - } else if (("·ñ").equals(result.get("countyLevelCity"))) { - result.put("prefectureLevelCity", "ÊÇ"); - } - // Èç¹ûÊÇÎÞЧÐÅÏ¢»òÕßûÓÐÐÐÕþÇø»®£¬ÔòÓÃÎÒÃÇµÄ - if (result.containsKey("addrVerify") && ("ÎÞЧ".equals(result.getString("addrVerify")) || "ûÓÐÐÐÕþÇø»®".equals(result.getString("addrVerify")))) { + //ÎÒÃÇÊ¡¼¶¼°ÒÔÉÏÓпª·¢Çø£¬Ö±½ÓÓÃÎÒÃǵĽá¹û + if (result.containsKey("devDistrictName")) { basicModel.setResult(result); - //ÎÒÃÇÊ¡¼¶¼°ÒÔÉÏÓпª·¢Çø£¬Ö±½ÓÓÃÎÒÃǵĽá¹û - } else if (result.containsKey("devDistrictName")) { + + } else if (!"2".equals(type)) { // ¶Ô˽µÄ²»ÓÃÆëÁº basicModel.setResult(result); } else { try { //Èç¹ûÊǽ­ËÕÊ¡»òÕßÕã½­Ê¡ µ÷ÓÃÆëÁºµÄ½á¹û if ("½­ËÕÊ¡".equals(result.getString("province")) || "Õã½­Ê¡".equals(result.getString("province"))) { - //½á¹û±È½Ï£¬Èç¹ûɿũ½á¹û²»Ò»Ö //µ÷ÓÃÆëÁº type £º1 ¶Ô¹« 0 ¶Ô˽ //ÎÒÃÇ type £º1 ¶Ô˽ 2 ¶Ô¹² @@ -113,23 +145,31 @@ public class GdBankController { Map map = senRequest(address, qltype); // ɿũ½á¹û²»Ò»Ñù if (!map.get("verifyFlag").equals(result.get("verifyFlag"))) { - //ÓÐÊÐϽ½¨ÖÆÕò, »òÕß³ÇÊв»Ò»Ñù ÓÃÎÒÃÇ - if (result.containsKey("city") && ("ÊÇ".equals(result.get("administrativeTowns")) || (!result.get("city").equals(map.get("city")) - && StringUtils.isNotBlank(result.getString("city"))))) { + // ÆëÁºÏØÕþ¸®µ«ÊÇÉæÅ©ÎªÅ©£¬È¡ÎÒÃǵĽá¹û ÑïÖÐÊÐÈýé½ÖµÀÖлª´åÓÀ¹ÌºÓ·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("typeName", areaMap.get(map.get("typeCode"))); + map.put("addrArea", addrArea(map, type)); + map.put("countyLevelCity", countyLevelCity(map)); + basicModel.setResult(map); + } } else { - if (("ÊÇ").equals(result.get("countyLevelCity"))) { - map.put("prefectureLevelCity", "·ñ"); - } else if (("·ñ").equals(result.get("countyLevelCity"))) { - map.put("prefectureLevelCity", "ÊÇ"); - } map.put("addrVerify", "µØÖ·ÓÐЧ"); - if (result.containsKey("countyLevelCity")) { - map.put("countyLevelCity", result.getString("countyLevelCity")); - } map.put("typeName", areaMap.get(map.get("typeCode"))); + map.put("addrArea", addrArea(map, type)); + map.put("countyLevelCity", countyLevelCity(map)); basicModel.setResult(map); } + } else { basicModel.setResult(result); } @@ -145,6 +185,7 @@ public class GdBankController { } } + } mav.setModel(basicModel); } else { 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 fa4c6891f..48b616432 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 @@ -78,7 +78,7 @@ class PoseidonOnce { // DBCursor cur = coll.find() // println cur.count() String url = "http://www.fangjia.com"; - DBCollection coll = MongoUtils.getCollectionByName("fangjia", "test2", "192.168.0.188") + DBCollection coll = MongoUtils.getCollectionByName("fangjia", "FiveLevelTest", "192.168.0.188") // for(int i=426000;i<1000000;i++) { // String s = url + i + "_" + url.hashCode() // DBObject dbo = new BasicDBObject() 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 2624d025c..ae1400128 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 @@ -16,7 +16,8 @@ class MinglujiData { DBCollection mlj_COLL = MongoUtils.getCollectionByName("crawl", "kfq_mingluji_com", "192.168.0.206",27020) def MONGO100_URL = "mongodb://admin:G00MONGOADMIN@192.168.0.100:30009"; - DBCollection development_zone_CONN = MongoUtils.getCollectionByName2("fangjia", "development_zone", MONGO100_URL) + + DBCollection development_zone_CONN = MongoUtils.getCollectionByName("fangjia_base", "development_zone", "mongo.db.fangjia.com") DBCollection dev_mapping_CONN = MongoUtils.getCollectionByName2("fangjia", "dev_mapping", MONGO100_URL) DBCollection community_100_CONN = MongoUtils.getCollectionByName2("fangjia", "community", MONGO100_URL) @@ -30,16 +31,19 @@ class MinglujiData { } def run(){ - def prov = "Õã½­Ê¡" - def city = "¼ÎÐË" + def prov = "ºÓ±±Ê¡" + def city = "ʯ¼ÒׯÊÐ" // exportDatas(city) - matchDev(prov, city) - matchCommunity(city) - +// matchDev(prov, city) +// matchCommunity(city) +// fiveLevelSplit(city) + nineLevelSplit(city) // tempMatchDev(prov) + +// checkDev() // saveMljData() - fiveLevelSplit(city) + } def exportDatas(city){ def datas = findMinglujiDatas(city) @@ -84,9 +88,9 @@ class MinglujiData { if (d['E'] && !d['N']) { - def obj = findDevByName(d['E']) + def obj = findDevByName(null, d['E']) if (!obj) { - obj = findDevByAlias(d['E']) + obj = findDevByAlias(null, d['E']) if (!obj) { obj = findDebBySimlar(devs, d['E'], d['B']) if (!obj) { @@ -122,9 +126,9 @@ class MinglujiData { def devs = loadAllDevs(prov) ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\ºþÖÝ-¿ª·¢Çø-µÈ¼¶.xlsx",{d-> if(d['U'] && !d['W'] ){ - def obj = findDevByName(d['U']) + def obj = findDevByName(null, d['U']) if(!obj){ - obj = findDevByAlias(d['U']) + obj = findDevByAlias(null, d['U']) if(!obj){ obj = findDebBySimlar(devs, d['U'], d['B']) if(!obj){ @@ -202,34 +206,157 @@ class MinglujiData { } } + def nineLevelSplit(city){ + def i = 1; + while(i<20) { + def fileName = "/home/goojia/gj/mlj_${i}.xlsx" + if (CommonDatautils.isWindow()) { + fileName = "D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\${city}_${i}.xlsx" + } + + File file = new File(fileName); + if (file.exists()) { + ExcelUtils.modify(fileName,{d-> + if(d['E'] && !d['Z']){ + def jsonObject1 = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(d['B'], d['E']) + if(jsonObject1) { + if (jsonObject1.get("dev") && jsonObject1.get("dev") != "null") { + def devName = jsonObject1.get("dev") + def obj = findDev(jsonObject1.get("city"), devName) + d['AD'] = devName + if(jsonObject1.containsKey("detail") && jsonObject1.detail.dev_confi!='null'){ + d['AJ'] = jsonObject1.detail.dev_confi + } + if (obj) { + d['AG'] = obj._id.toString() + d['AF'] = obj.name + } + } + } + } + + if(d['J'] && !d['M']) { + def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatNinelevel(d['B'], d['J']) + def street = jsonObject.get("street") + def streetNumber = jsonObject.get("streetNumber") + if (jsonObject.get("province") && jsonObject.get("province") != "null") { + d['W'] = jsonObject.get("province") + } + + if (jsonObject.get("city") && jsonObject.get("city") != "null") { + d['X'] = jsonObject.get("city") + } + + if (jsonObject.get("district") && jsonObject.get("district") != "null") { + d['Y'] = jsonObject.get("district") + } + + if (jsonObject.get("township") && jsonObject.get("township") != "null") { + d['Z'] = jsonObject.get("township") + } + + if (jsonObject && street && streetNumber && street != "null") { + d['AA'] = jsonObject.get("street") + def road = jsonObject.get("street") + if (streetNumber != 'null') { + d['AB'] = jsonObject.get("streetNumber") + road = road + jsonObject.get("streetNumber") + } else { + d['AC'] = "ÐÅÏ¢²»ÍêÕû" + } + + if (!d['AC'] && !d['J'].contains(road)) { + d['AC'] = "Ô­µØÖ·²»º¬Â·" + } + + if (!d['AC']) { + def flag = road.matches('^[\u4e00-\u9fa5]+?(·|´óµÀ|Ïï|ºúͬ|½Ö).+[ŪºÅ]$') + if (!flag) { + d['AC'] = "··Ç·¨" + } + def roadsize = jsonObject.get("street").size() + if (!d['AC'] && (roadsize < 3 || roadsize > 7)) { + d['AC'] = "·̫³¤|·̫¶Ì" + } + } + }else{ + d['AC'] = "ÎÞµØÖ·" + } + + if (jsonObject.get("dev") && jsonObject.get("dev") != "null") { + def devName = jsonObject.get("dev") + def obj = findDev(jsonObject.get("city"), devName) + d['AE'] = devName + if (obj) { + d['AI'] = obj._id.toString() + d['AH'] = obj.name + } + if(jsonObject.containsKey("detail") && jsonObject.detail.dev_confi!='null'){ + d['AK'] = jsonObject.detail.dev_confi + } + } + } + },0) + println fileName +" ¾Å¼¶²ð·ÖÍê³É" + } + i++ + } + } + + + def findDev( city, name){ + def obj = findDevByName(city, name) + if(!obj){ + obj = findDevByAlias(city, name) + if(obj){ + obj.match_way = "±ðÃû" + } + }else{ + obj.match_way = "Ïàͬ" + } + return obj + } def fiveLevelSplit(city){ def i = 1; while(i<20) { def fileName = "/home/goojia/gj/mlj_${i}.xlsx" if (CommonDatautils.isWindow()) { - fileName = "D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\mlj_${i}.xlsx" + fileName = "D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\${city}_${i}.xlsx" } File file = new File(fileName); if (file.exists()) { ExcelUtils.multiThreadingModify(fileName, { d -> - if(d['J'] && !d['X']){ + if(d['J'] && !d['AN']){ def jsonObject = com.fangjia.script.gj.district.FangjiaClientUtils.formatFivelevel(d['B'], d['J']) if(jsonObject) { if (jsonObject.get("address") && jsonObject.get("address") != "null") { - d['X'] = jsonObject.get("address") + d['AN'] = jsonObject.get("address") } } } }) } i++ + println fileName +" Îå¼¶²ð·ÖÍê³É" } } + def checkDev(){ + ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\¼ÎÐËÈë¿âÊý¾Ý.xlsx",{d-> + if(d['F']){ + def obj = findDevByName(null, d['F']) + if(obj){ + d['I'] = "¿âÖÐ" + }else{ + d['I'] = "·Ç¿âÖÐ" + } + } + }) + } def saveMljData(){ - ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\ºþÖÝÈë¿â2.xlsx",{d-> + ExcelUtils.multiThreadingModify("D:\\Êý¾Ý\\Êý¾Ý½¨Éè\\Ãû¼¼¯\\¼ÎÐËÈë¿âÊý¾Ý.xlsx",{d-> def obj = new BasicDBObject() obj.put("province", d['A']) obj.put("city", d['B']) @@ -281,14 +408,20 @@ class MinglujiData { } return last } - def findDevByName(name){ + def findDevByName(city, name){ def q = new BasicDBObject() + if(city){ + q.put("city", city) + } q.put("name", name) return development_zone_CONN.findOne(q) } - def findDevByAlias(name){ + def findDevByAlias(city, name){ def q = new BasicDBObject() + if(city){ + q.put("city", city) + } q.put('alias', new BasicDBObject('$in',[name])) return development_zone_CONN.findOne(q) } 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 99b913307..cb6e34cda 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 @@ -19,7 +19,7 @@ class MsbPocTest { // match(inputfile) // matchOld(inputfile) // addPrice("D:\\Êý¾Ý\\ÃÀÊõ±¦\\ÃÀÊõ±¦²âÊÔÊý¾Ý(¼Û¸ñ).xlsx") -// test("D:\\Êý¾Ý\\ÃÀÊõ±¦\\test2.xlsx") +// test("D:\\Êý¾Ý\\ÃÀÊõ±¦\\FiveLevelTest.xlsx") // cityPrice() // mergeMatchPrice("D:\\Êý¾Ý\\ÃÀÊõ±¦\\ÃÀÊõ±¦-нӿڼ۸ñ.xlsx") 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 b1ed3a554..d0c89f4fc 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 @@ -1,5 +1,6 @@ package com.fangjia.script.hubingliang +import com.fangjia.core.Constants import com.fangjia.core.util.DateUtil import groovy.sql.Sql @@ -23,7 +24,7 @@ import com.mongodb.DBObject @BatchOwner(Watcher.Hubingliang) class ApiInvokeStatistics extends BaseBatch{ final static def mongoDomain = "mongo.db.fangjia.com" - public static final DBCollection OPEN_URI_LOG = MongoUtils.getCollectionByName("business", "open_uri_log", "seawater.mongo.db.fangjia.com", 27020) + public static final DBCollection OPEN_URI_LOG = com.fangjia.core.util.MongoUtils.getDbCollection(Constants.SEAWATER_MONGO_URI,"business", "open_uri_log") public static final DBCollection OPEN_URI_LOG_COUNT = MongoUtils.getCollectionByName("business", "api_invoke_statistical", "mongo.db.fangjia.com", 27017) static final dbFangjia = Sql.newInstance("jdbc:mysql://mysql.db.fangjia.com:4306/fangjia?autoReconnect=true&characterEncoding=utf-8&autoReconnect=true", "sa", "G00jia", "com.mysql.jdbc.Driver"); static main(args) { diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test.groovy deleted file mode 100644 index 350ffa191..000000000 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test.groovy +++ /dev/null @@ -1,72 +0,0 @@ -package com.fangjia.script.majintao - -import com.fangjia.core.util.HttpRequest -import com.fangjia.script.util.ExcelUtils -import net.sf.json.JSONObject - - -String excelFilePath = "F:\\¹À¼Ò\\Îļþ\\±±½»Ëù\\testcopy1.xlsx"; -ExcelUtils.removeEmptyRow(excelFilePath) -ExcelUtils.singleThreadingModify(excelFilePath, { List items -> - - String comprehensiveUrl = "http://localhost:9180/comprehensiveQuery/houseValueInformation"; - String communityUrl = "http://open.fangjia.com/addrSvc/avgPrice"; - String valueUrl = "http://open.fangjia.com/property/addressEvaluate"; - String caseUrl = "http://open.fangjia.com/house/case"; - String poiUrl = "http://open.fangjia.com/district/addrFacilitys"; - - HttpRequest httpRequest = new HttpRequest(); - map = new HashMap() - - String city = items['A'] - String address = items['B'] - double size = items['C'] - - System.out.println(city + "---" + address + "----" + size); - - map.put("city", city) - map.put("address", address) - map.put("size", size.toString()) - map.put("strctureArea", size.toString()) - map.put("token", "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB") - - if (!address.contains("%")) { - // ·¢ËÍHTTPÇëÇó - long start - long end - -// start = System.currentTimeMillis(); -// httpRequest.getJsonContent(communityUrl, map, "UTF-8") -// -// -// end = System.currentTimeMillis(); -// items['D'] = String.valueOf(end - start); -// -// start = System.currentTimeMillis(); -// httpRequest.getJsonContent(valueUrl, map, "UTF-8") -// end = System.currentTimeMillis(); -// items['E'] = String.valueOf(end - start); -// -// start = System.currentTimeMillis(); -// httpRequest.getJsonContent(caseUrl, map, "UTF-8") -// end = System.currentTimeMillis(); -// items['F'] = String.valueOf(end - start); -// -// start = System.currentTimeMillis(); -// httpRequest.getJsonContent(poiUrl, map, "UTF-8") -// end = System.currentTimeMillis(); -// items['G'] = String.valueOf(end - start); - - start = System.currentTimeMillis(); - def content = httpRequest.getJsonContent(comprehensiveUrl, map, "UTF-8") - end = System.currentTimeMillis(); - items['H'] = String.valueOf(end - start); - println content.get("msg") - if(content.get("msg").contains("¸ÃµØÖ·²»Ö§³Ö¹À¼Û£¡")) { - items['I'] = "¸ÃµØÖ·²»Ö§³Ö¹À¼Û£¡" - } - } - - -}) - diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test2.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test2.groovy deleted file mode 100644 index 2c6e2d2ea..000000000 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/majintao/test2.groovy +++ /dev/null @@ -1,4 +0,0 @@ -import org.bson.types.ObjectId - -a = new ObjectId() -print(a) \ No newline at end of file diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/openApi/OpenApiLogAnalyBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/openApi/OpenApiLogAnalyBatch.groovy index cd92b6635..135c1b920 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/openApi/OpenApiLogAnalyBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/openApi/OpenApiLogAnalyBatch.groovy @@ -1,5 +1,6 @@ package com.fangjia.script.openApi +import com.fangjia.core.Constants import groovy.sql.Sql; import java.util.regex.Matcher import java.util.regex.Pattern @@ -24,7 +25,7 @@ import com.fangjia.script.Watcher class OpenApiLogAnalyBatch extends BaseBatch{ - static DBCollection OPEN_URI_LOG_COLL = MongoUtils.getCollectionByName("business", "open_uri_log", "seawater.mongo.db.fangjia.com",27020); + static DBCollection OPEN_URI_LOG_COLL = com.fangjia.core.util.MongoUtils.getDbCollection(Constants.SEAWATER_MONGO_URI,"business", "open_uri_log") static DBCollection OPEN_URI_ANALY_COLL = MongoUtils.getCollectionByName("business", "open_uri_analy", "mongo.db.fangjia.com"); final Sql USER_CONN = Sql.newInstance("jdbc:mysql://mysql.db.fangjia.com:4306/fangjia?useUnicode=true&characterEncoding=utf-8&autoReconnect=true", "sa", "G00jia", "com.mysql.jdbc.Driver") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/AnalysisOpenUriLogSyncBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/AnalysisOpenUriLogSyncBatch.groovy index a634ea6dc..9979ef73c 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/AnalysisOpenUriLogSyncBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/sync/AnalysisOpenUriLogSyncBatch.groovy @@ -16,6 +16,7 @@ import org.apache.commons.lang.StringUtils import org.elasticsearch.action.bulk.BulkProcessor import org.elasticsearch.action.index.IndexRequest import java.util.concurrent.TimeUnit +import com.fangjia.core.Constants /** * ¹¦ÄÜ˵Ã÷: @@ -24,7 +25,7 @@ import java.util.concurrent.TimeUnit class AnalysisOpenUriLogSyncBatch extends BaseBatch { - DBCollection OPEN_URI_LOG_COLL = MongoUtils.getCollectionByName("business", "open_uri_log", "192.168.0.206",27020) + DBCollection OPEN_URI_LOG_COLL = com.fangjia.core.util.MongoUtils.getDbCollection(Constants.SEAWATER_MONGO_URI,"business", "open_uri_log") static final def SQL = Sql.newInstance("jdbc:mysql://mysql.db.fangjia.com:4306/goojia_fangjia?&characterEncoding=utf8", "sa", "G00jia", "com.mysql.jdbc.Driver"); @@ -53,7 +54,7 @@ class AnalysisOpenUriLogSyncBatch extends BaseBatch { void process(Object args) { Map userInfo = getUserInfo() - def startDate = DateUtil.truncateDay(DateUtil.add(new Date(), -3)) + def startDate = DateUtil.truncateDay(DateUtil.add(new Date(), -30)) def endDate = DateUtil.truncateDay(new Date()) BasicDBObject query = new BasicDBObject() query.append("c_date", new BasicDBObject('$gte', startDate).append('$lt', endDate)) diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/webCrawl/Test.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/webCrawl/Test.groovy index 796aaedcb..11d317c09 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/webCrawl/Test.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/webCrawl/Test.groovy @@ -43,15 +43,15 @@ class Test { static main(args) { // String test1 = " qwdwqd ssss "; -// String test2 = "¡¡qwdwqd ss"; +// String FiveLevelTest = "¡¡qwdwqd ss"; // String test3 = "qwdwqd¡¡£ä£ä"; // // test1 = test1.replaceAll("¡¡|\\s+", " "); -// test2 = test2.replaceAll("¡¡|\\s+", " "); +// FiveLevelTest = FiveLevelTest.replaceAll("¡¡|\\s+", " "); // test3 = test3.replaceAll("¡¡|\\s+", " "); // // String[] arrs1 = test1.split("\\s+") -// String[] arrs2 = test2.split("\\s+") +// String[] arrs2 = FiveLevelTest.split("\\s+") // String[] arrs3 = test3.split("\\s+") // // println arrs1