From 7694a310e24edcd3170c5d7ea84c5139ee43e1a0 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 10 Nov 2025 09:56:06 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/script/gj/OpenApiUtils.groovy | 17 ----------------- .../script/gj/village/XiamenVillage.groovy | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) 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 6ded33f82..bfc91de49 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 @@ -847,23 +847,6 @@ class OpenApiUtils { } - static def addrVerifyShBank(city, address){ - address = URLEncoder.encode(address, "utf-8"); -// def url = "http://192.168.0.100:32080/FangJiaAddressService/cebEnterpriseVillageIdentify?address=${address}" - def url = "http://localhost:8080/addrSvc/boscEnterpriseVillageIdentify?address=${address}&token=F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB" - if(city){ - url = url + "&city=${city}" - } - String content = new HttpRequest().get(url, "utf-8"); - if(content){ - def doc = new JsonSlurper().parseText(content) - if(doc && doc.code ==200 && doc.result){ - def dtos = doc.result - return dtos - } - } - return null; - } static def addrVerifyBase(city, address){ 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 6d8badbb2..4337e871e 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:\\数据\\厦门\\涉农组织类型判定(to估家,2025-09-30)-结果.xlsx",{ d-> + ExcelUtils.multiThreadingModify("D:\\数据\\厦门\\涉农组织类型判定(to估家,2025-10-31)-以此为准.xlsx",{ d-> if(!d['R']){ def dto = OpenApiUtils.addrVerifyXiameng(null, d['B'], 2) From 428fa5420787a12a5acd594b437af318a01bba68 Mon Sep 17 00:00:00 2001 From: gaojuan Date: Mon, 10 Nov 2025 15:46:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9F=A5=E6=88=BF=E6=BA=90=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../script/gj/district/DistrictLocationGeo.groovy | 8 +++++--- .../FjwBigdataForsaleBatch.groovy | 15 +++++---------- .../script/yinjihaun/amap/GaoDeApiUtils.groovy | 7 +++---- 3 files changed, 13 insertions(+), 17 deletions(-) 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 04ec66d5f..eefe4d587 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 @@ -5,7 +5,6 @@ import com.fangjia.script.util.MongoUtils import com.fangjia.script.yinjihaun.amap.GaoDeApiUtils import com.mongodb.BasicDBObject import com.mongodb.DBCollection -import org.bson.types.ObjectId class DistrictLocationGeo { @@ -16,9 +15,10 @@ class DistrictLocationGeo { task.run()//调用高德逆解析,并保存数据 } def run(){ - ExcelUtils.modify("D:\\数据\\京东\\需逆解析数据-test.xlsx",{ d-> + ExcelUtils.multiThreadingModify("D:\\数据\\京东\\需逆解析数据.xlsx", { d -> def jsonObject = GaoDeApiUtils.geocode(d['C']) - if(jsonObject){ + def count = 0 + if (jsonObject) { def dbo = new BasicDBObject() dbo.put("old_id", d['B']) dbo.put("old_location", d['C']) @@ -29,7 +29,9 @@ class DistrictLocationGeo { dbo.put("roadinters", jsonObject.regeocode.roadinters) dbo.put("aois", jsonObject.regeocode.aois) seaweedGaodePoisColl.save(dbo) + count = jsonObject.regeocode.pois.size() } + d['D'] = count }) } } diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataForsaleBatch.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataForsaleBatch.groovy index 9d42392f1..c9801ad9e 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataForsaleBatch.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/gj/fjwPriceBaseData/FjwBigdataForsaleBatch.groovy @@ -6,17 +6,15 @@ import com.fangjia.script.Watcher import com.fangjia.script.ccbevaluation.CcbCommonUtils import com.fangjia.script.commData.CommonDatautils import com.fangjia.script.gj.ccb.CcbCodeUtils -import com.fangjia.script.gj.ccb.FileUtils import com.fangjia.script.util.DateUtils import com.fangjia.script.util.ElasticUtils import com.fangjia.script.util.ExcelUtils -import com.fangjia.script.util.FangJiaAreaMapUtils -import com.google.common.hash.* +import com.google.common.hash.BloomFilter +import com.google.common.hash.Funnels import com.mongodb.BasicDBObject import com.mongodb.DBObject import groovy.sql.Sql import org.apache.commons.lang.StringUtils -import org.bson.types.ObjectId import org.elasticsearch.index.query.BoolQueryBuilder import org.elasticsearch.index.query.QueryBuilder import org.elasticsearch.index.query.QueryBuilders @@ -24,15 +22,12 @@ import org.elasticsearch.xpack.sql.jdbc.EsDataSource import java.nio.charset.StandardCharsets import java.util.concurrent.ConcurrentHashMap -import java.util.concurrent.CopyOnWriteArrayList import java.util.concurrent.CountDownLatch import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.atomic.AtomicLong import java.util.regex.Matcher import java.util.regex.Pattern - - /** * 建行模型估值项目 * 出售房源数据同步 @@ -201,7 +196,7 @@ class FjwBigdataForsaleBatch extends BaseBatch{ } finally { latch.countDown() } - }; + }; }) } latch.await() @@ -492,8 +487,8 @@ class FjwBigdataForsaleBatch extends BaseBatch{ def findHousesByMdate(def city, def region, def cat, def startDate, def endDate, def name, def alias, def estate_type2, rets1){ -// def date = DateUtils.addMonth(endDate.toString(), -3, "yyyyMMdd") - def date = DateUtils.addMonth(endDate.toString(), -12, "yyyyMMdd") + def date = DateUtils.addMonth(endDate.toString(), -3, "yyyyMMdd") +// def date = DateUtils.addMonth(endDate.toString(), -12, "yyyyMMdd") def startMdate = DateUtils.parseFromTightByPattern(date,"yyyyMMdd")//DateUtils.parseFromTightByPattern("20240519","yyyyMMdd") def endMdate = DateUtils.parseFromTightByPattern(endDate.toString(), "yyyyMMdd")//DateUtils.parseFromTightByPattern("20240718", "yyyyMMdd") diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/amap/GaoDeApiUtils.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/amap/GaoDeApiUtils.groovy index c9dceabe6..071511118 100644 --- a/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/amap/GaoDeApiUtils.groovy +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/yinjihaun/amap/GaoDeApiUtils.groovy @@ -1,19 +1,17 @@ package com.fangjia.script.yinjihaun.amap import com.fangjia.core.util.HttpRequest -import com.fangjia.script.common.DataHandleUtils import com.fangjia.script.thirdPriceCrawl.UserAgents import com.fangjia.script.util.ABuYunUtil import com.fangjia.script.util.JacksonUtil import net.sf.json.JSONObject import org.apache.commons.lang.StringUtils -import org.jsoup.Jsoup import java.util.zip.GZIPInputStream class GaoDeApiUtils { - //94c74c60e102972a8d17b7b75d7403be - def static GAO_DE_AK = "a34894d151fffff94f9a33bae3d5565c" //宝剑:c6fcd4bfbc40d73ee762b8115dca3390 + //67423021cae3b58e5c2ac595a389b036 :临时买的key + def static GAO_DE_AK = "67423021cae3b58e5c2ac595a389b036" //宝剑:c6fcd4bfbc40d73ee762b8115dca3390 //15021384995:dfc2245bac8a7b2d5b62e060e59d4eca /** @@ -39,6 +37,7 @@ class GaoDeApiUtils { try { content = new HttpRequest().get("http://restapi.amap.com/v3/geocode/regeo", params, "utf-8") } catch (Exception e) { + println location + " 出错:"+content content = new HttpRequest().get("http://restapi.amap.com/v3/geocode/regeo", params, "utf-8") } jsonObj = JSONObject.fromObject(content) From 321c830768dd48cb0f34be0354f93116b013d216 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Sun, 16 Nov 2025 10:18:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=AD=98=E5=82=A8=EF=BC=9Aclass=20net.sf.json.JSONNull?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../open/interceptors/AuditInterceptor.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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 dc87931f8..cd2da8ea8 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 @@ -1,6 +1,7 @@ package com.fangjia.open.interceptors; import com.fangjia.core.util.AnalyticsUtil; +import com.fangjia.core.util.JsonUtils; import com.fangjia.dal.mongo.open.model.OpenResource; import com.fangjia.dal.mongo.tool.model.OpenUriLog; import com.fangjia.dal.sql.model.ApiUser; @@ -12,6 +13,8 @@ import com.fangjia.open.model.BasicModel; import com.fangjia.open.model.RestfulModelAndView; import com.fangjia.service.open.OpenResourceService; import com.fangjia.service.open.OpenUriLogService; +import com.fasterxml.jackson.databind.ObjectMapper; +import net.sf.json.JSONNull; import net.sf.json.JSONObject; import net.sf.json.JsonConfig; import net.sf.json.processors.JsonValueProcessor; @@ -22,17 +25,13 @@ import org.sothis.web.mvc.ActionContext; import org.sothis.web.mvc.ActionInvocation; import org.sothis.web.mvc.ActionInvocationException; import org.sothis.web.mvc.Interceptor; - import javax.servlet.http.HttpServletRequest; -import java.math.BigDecimal; import java.text.SimpleDateFormat; -import java.util.Collection; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.Map; +import java.util.*; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; + /** * API审计日志监控器 * @@ -116,7 +115,6 @@ public class AuditInterceptor implements Interceptor { } return params; } - /** * @param request * @param apiUser @@ -163,7 +161,7 @@ public class AuditInterceptor implements Interceptor { if(isSaveResult(request)){ JSONObject json = JSONObject.fromObject(result, DEFAULT_JSON_CONFIG); json.remove("tid"); - openUriLog.setResMap(json); + openUriLog.setResMap((Map)JsonUtils.convertJsonToJavaObj(json, Map.class)); } } catch (Exception e) { LOGGER.error("", e); From 0e7cbd435a5a87303b8f97adbb9439b1d01d1d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Sun, 16 Nov 2025 10:35:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fangjia/service/address/AddressParserServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java index 6f6590ee0..caf1898b7 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java @@ -339,7 +339,11 @@ public class AddressParserServiceImpl implements AddressParserService { } } } - district = districtService.findById(district.getId(), MATCH_PROPERTY_FIELDS); + if(district == null){ + logger.error("未找到匹配的CPDB数据:" + addr + "ID:" + matchedMate.getId()); + }else{ + district = districtService.findById(district.getId(), MATCH_PROPERTY_FIELDS); + } if(district == null){ logger.error("未找到匹配的CPDB数据:" + addr + "ID:" + district.getId()); } From ece1bd56f405bea388b6d7b9fb4cc43c600feef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Sun, 16 Nov 2025 10:49:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fangjia/service/address/AddressParserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java index caf1898b7..e49a3286a 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/address/AddressParserServiceImpl.java @@ -345,7 +345,7 @@ public class AddressParserServiceImpl implements AddressParserService { district = districtService.findById(district.getId(), MATCH_PROPERTY_FIELDS); } if(district == null){ - logger.error("未找到匹配的CPDB数据:" + addr + "ID:" + district.getId()); + logger.error("未找到匹配的CPDB数据:" + addr + "ID:" + matchedMate.getId()); } return new Building(district, scoreResult.getScore(matchedMate)); }else{