From 167aae21641c6f333f80a8cea27f09d64c2fc719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=96=87=E8=89=B3?= Date: Thu, 26 Feb 2026 15:57:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=98=93=E6=96=B9=E8=BE=BE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BB=A5=E5=8F=8A=E6=B7=BB=E5=8A=A0claude?= =?UTF-8?q?=E6=8A=80=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .claude/settings.local.json | 11 + .claude/skills/fangjia-openapi-dev/SKILL.md | 522 ++++++++++++++++++ .../assets/估家科技开放接口文档-模版.docx | Bin 0 -> 53701 bytes .../references/api-testing-guide.md | 509 +++++++++++++++++ .../references/code-templates.md | 201 +++++++ .../references/database-tables.md | 304 ++++++++++ .../references/development-standards.md | 190 +++++++ .gitignore | 2 + CLAUDE.md | 424 ++++++++++++++ deliverables/fangjiastatic/pom.xml | 2 +- deliverables/settings.xml | 91 ++- .../main/java/com/fangjia/core/Constants.java | 6 + .../open/controllers/EfundController.java | 54 ++ .../script/opentest/EfundInterfaceTest.groovy | 222 ++++++++ .../opentest/EfundTestDataExtractor.groovy | 122 ++++ .../script/temp/convertEncoding.groovy | 56 ++ .../api/AddressMatchProxyServiceImpl.java | 2 +- .../district/DistrictStatServiceImpl.java | 6 +- .../service/efund/EfundMatchService.java | 19 + .../service/efund/EfundMatchServiceImpl.java | 308 +++++++++++ projects/fangjia-static/pom.xml | 4 +- 21 files changed, 3031 insertions(+), 24 deletions(-) create mode 100644 .claude/settings.local.json create mode 100644 .claude/skills/fangjia-openapi-dev/SKILL.md create mode 100644 .claude/skills/fangjia-openapi-dev/assets/估家科技开放接口文档-模版.docx create mode 100644 .claude/skills/fangjia-openapi-dev/references/api-testing-guide.md create mode 100644 .claude/skills/fangjia-openapi-dev/references/code-templates.md create mode 100644 .claude/skills/fangjia-openapi-dev/references/database-tables.md create mode 100644 .claude/skills/fangjia-openapi-dev/references/development-standards.md create mode 100644 CLAUDE.md create mode 100644 projects/fangjia-open/src/main/java/com/fangjia/open/controllers/EfundController.java create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/opentest/EfundInterfaceTest.groovy create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/opentest/EfundTestDataExtractor.groovy create mode 100644 projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/convertEncoding.groovy create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/efund/EfundMatchService.java create mode 100644 projects/fangjia-service/src/main/java/com/fangjia/service/efund/EfundMatchServiceImpl.java diff --git a/.claude/settings.local.json b/.claude/settings.local.json new file mode 100644 index 000000000..795b2c552 --- /dev/null +++ b/.claude/settings.local.json @@ -0,0 +1,11 @@ +{ + "permissions": { + "allow": [ + "Skill(skill-creator)", + "Bash(pandoc:*)", + "Bash(python ooxml/scripts/unpack.py:*)", + "Bash(npm install:*)", + "Bash(node generate_doc.js:*)" + ] + } +} diff --git a/.claude/skills/fangjia-openapi-dev/SKILL.md b/.claude/skills/fangjia-openapi-dev/SKILL.md new file mode 100644 index 000000000..d2b8010e1 --- /dev/null +++ b/.claude/skills/fangjia-openapi-dev/SKILL.md @@ -0,0 +1,522 @@ +--- +name: fangjia-openapi-dev +description: 房价开放平台(fangjia-open)接口开发技能。用于开发基于估家科技开放平台的RESTful API接口。当用户需要:(1) 开发新的OpenAPI接口,(2) 阅读接口需求文档并生成代码,(3) 生成OpenAPI接口文档,(4) 分析接口需求并给出开发建议时使用此技能。支持从Word/PDF需求文档自动提取接口信息、生成Controller/Service/DAO代码、生成API文档。 +--- + +# 估家科技OpenAPI接口开发 + +本技能帮助开发房价开放平台(fangjia-open)的RESTful API接口,包括需求分析、代码生成、文档编写全流程。 + +## 何时使用此技能 + +- 用户提供接口需求文档(Word/PDF/Markdown) +- 用户要求开发新的OpenAPI接口 +- 用户需要生成API接口文档 +- 用户询问"如何开发XXX接口" + +## 开发流程 + +### 阶段1:需求分析 + +**1.1 读取需求文档** + +如果用户提供Word/PDF文档: +```bash +# 使用pandoc转换为Markdown +pandoc "文档路径.docx" -o "文档路径.md" +# 然后读取转换后的Markdown文件 +``` + +**1.2 提取关键信息** + +从需求文档中提取: +- 接口功能描述 +- 输入参数(参数名、类型、是否必填、说明) +- 输出字段(字段名、类型、描述) +- 业务逻辑要求 + +**1.3 检查缺失信息** + +必须向用户确认以下信息(如果文档中没有): + +| 信息项 | 询问示例 | +|-------|---------| +| **接口URL** | "文档中没有指定接口URL,建议使用 `/property/priceQuery`,您确认吗?" | +| **数据来源** | "请问数据来自哪里?MongoDB的哪个Collection?还是MySQL的哪个表?" | +| **Service层** | "是否有现成的Service可以调用?如果没有,需要在哪个业务模块下创建?" | +| **DAO层** | "是否有现成的DAO?如果需要新建,数据库是MongoDB还是MySQL?" | + +**1.4 给出合理性建议** + +检查以下方面并给出建议: +- ✅ 参数命名是否符合驼峰命名规范 +- ✅ 必填/可选参数设置是否合理 +- ✅ 返回字段是否完整(建议添加时间戳、匹配置信度等) +- ✅ 是否考虑了异常情况(如地址未匹配) + +--- + +### 阶段2:代码开发 + +按照顺序开发:**DAO → Service → Controller** + +**注意**:由于返回字段使用下划线命名,通常**不需要创建专门的Model类**,直接使用`UniversalDto`封装返回结果。 + +**2.1 开发DAO层(如需要)** + +- 优先询问是否有现成的DAO可用 +- 如需新建,位置:`projects/fangjia-dal/src/main/java/com/fangjia/dal/` +- 根据数据库类型选择基类(AbstractMongoDao / AbstractSqlDao) + +**2.2 开发Service层** + +位置:`projects/fangjia-service/src/main/java/com/fangjia/service/{业务模块}/` + +必须创建: +1. Service接口 - 参考 [code-templates.md](references/code-templates.md) "Service 接口模板" +2. Service实现类 - 参考 [code-templates.md](references/code-templates.md) "Service 实现类模板" + +**注意**: +- 必须提供setter方法进行依赖注入 +- 不需要使用注解(@Service等) +- 不需要手动配置Spring Bean +- 优先复用现有Service(见"常用Service参考"章节) + +**2.3 开发Controller层** + +位置:`projects/fangjia-open/src/main/java/com/fangjia/open/controllers/` + +参考模板:[code-templates.md](references/code-templates.md) "Controller 模板" + +**关键要点**: +- 方法名必须以 `Action` 结尾 +- 添加 `@Authority(role = Role.USER)` 注解 +- 使用 `RestfulModelAndView` 作为返回值 +- 手动进行参数校验(使用 `StringUtils.isBlank` 等) +- **不要**使用try-catch(有统一异常处理) + +--- + +### 阶段3:生成API文档 + +**3.1 使用API文档模板** + +API文档模板位于(**相对于skill目录**):`assets\估家科技开放接口文档-模版.docx` + +**注意**:这是相对路径,完整路径为: +``` +.claude/skills/fangjia-openapi-dev/assets/估家科技开放接口文档-模版.docx +``` + +**3.2 生成文档内容** + +按照模板格式生成: + +1. **接口地址**:根据Controller和方法名确定URL +2. **输入参数表格**: + - 参数名 + - 参数类型(String/Integer/Float等) + - 是否必填 + - 说明 +3. **响应参数表格**: + - 名称 + - 类型 + - 描述 +4. **响应示例**:生成JSON格式示例 + +**3.3 文档生成方式** + +### 方式1:使用docx-js生成(强烈推荐) + +**重要**:为确保表格样式与模板完全一致,**强烈推荐**使用docx-js库直接生成Word文档。 + +使用pandoc转换可能导致: +- ❌ 表格边框样式不一致 +- ❌ 表头背景色不匹配 +- ❌ 单元格内边距不同 + +参考代码示例: +```javascript +// 创建表格时指定边框样式 +const tableBorder = { style: BorderStyle.SINGLE, size: 6, color: "000000" }; +const cellBorders = { top: tableBorder, bottom: tableBorder, left: tableBorder, right: tableBorder }; + +new Table({ + columnWidths: [2340, 2340, 4680], + margins: { top: 100, bottom: 100, left: 100, right: 100 }, + rows: [ + new TableRow({ + tableHeader: true, + children: [ + new TableCell({ + borders: cellBorders, + shading: { fill: "D3D3D3", type: ShadingType.CLEAR }, + children: [new Paragraph({ + alignment: AlignmentType.CENTER, + children: [new TextRun({ text: "参数名", bold: true })] + })] + }) + ] + }) + ] +}); +``` + +### 方式2:使用pandoc快速生成(仅供参考) + +仅用于快速预览,**最终交付文档必须使用方式1**: +```bash +pandoc api-doc.md -o api-doc.docx --reference-doc=".claude/skills/fangjia-openapi-dev/assets/估家科技开放接口文档-模版.docx" +``` + +--- + +## 开发规范 + +详见 [development-standards.md](references/development-standards.md) + +### 关键规范速查 + +| 项目 | 规范 | +|-----|------| +| URL映射 | `XxxController.methodAction` → `/xxx/method` | +| 返回格式 | `RestfulModelAndView` + `BasicModel` | +| 参数校验 | 手动代码校验(`StringUtils.isBlank`) | +| 依赖注入 | 提供setter方法,不使用注解 | +| 异常处理 | 不需要try-catch | +| 字符编码 | UTF-8 | + +--- + +## 常用Service参考 + +开发接口时经常需要使用以下核心Service: + +### 地址匹配相关 + +**AddressMatchProxyService** (`com.fangjia.service.api.AddressMatchProxyService`) + +- `newMatch(String city, String address, String category, boolean useMap)` + - 功能:地址匹配、property_type识别 + - 返回:JSONObject包含匹配结果(id, city, district, name, propertyType, street, township, credit等) + - 示例:`addressMatchProxyService.newMatch(null, "上海市浦东新区唐安路199弄", null, true)` + +### 房价查询相关 + +**DistrictStatService** (`com.fangjia.service.district.DistrictStatService`) + +- `findLatestDistrictAvgPrice(String city, String region, String block, String name)` + - 功能:查询最新小区均价 + - 返回:Integer(元/平方米) + +- `findOneDistrictStatsSort(String city, String region, String name, Date weekend)` + - 功能:查询指定时间的小区统计信息 + - 返回:DistrictStat对象(包含avgPrice, weekend等) + +### 成交数据相关 + +**DealPriceService** (`com.fangjia.service.mongo.fangjia.DealPriceService`) + +- `findHouseTradeHistoryLatest(DistrictKey key, int limit, boolean isVilla)` + - 功能:查询最近成交记录 + - 用途:计算典型总价(找到成交单价最接近参考均价的记录) + - 返回:List<DealPrice>(包含avgPrice, totalPrice, area, tradeDate等) + +- `findDealPriceList(String city, String region, String districtName, Date startDate, Date endDate)` + - 功能:查询指定时间范围的成交记录 + - 注意:日期参数不要传null,传明确的日期值 + - 返回:List<DealPrice> + +### 小区数据相关 + +**DistrictService** (`com.fangjia.service.datastore.DistrictService`) + +- `findById(String districtId)` + - 功能:根据ID查询小区信息(权威数据) + - 用途:地址匹配返回id后,查询权威的城市/区域/名称用于价格查询 + - 返回:District对象(包含city, region, name, block等) + +### 区域价格相关 + +**RegionSellStatService** (`com.fangjia.service.mongo.fangjia.RegionSellStatService`) + +- `findNewestRegionPrice(String city, String region)` + - 功能:查询最新区域均价 + - 注意:必须先用RegionData.formatCity和formatRegion格式化城市/区域为简称 + - 返回:RegionSellStat对象(包含avgPrice, date, updateDate等) + +### 使用示例 + +```java +// 1. 地址匹配 +JSONObject matchResult = addressMatchProxyService.newMatch(null, address, null, true); +String city = matchResult.optString("city"); +String name = matchResult.optString("name"); +String propertyType = matchResult.optString("propertyType"); + +// 2. 查询房价 +Integer avgPrice = districtStatService.findLatestDistrictAvgPrice(city, district, null, name); + +// 3. 查询数据更新时间 +DistrictStat latestStat = districtStatService.findOneDistrictStatsSort(city, district, name, null); +Date updateTime = latestStat.getWeekend(); + +// 4. 查询成交数据计算典型总价 +DistrictKey key = new DistrictKey(city, district, null, name); +List deals = dealPriceService.findHouseTradeHistoryLatest(key, 100, false); +// 找到成交单价最接近参考均价的记录 +``` + +--- + +## 关键开发经验 + +以下是实际开发中总结的关键技术要点,必须严格遵循: + +### 1. 地址匹配接口使用模式 ⭐⭐⭐ + +**核心原则**:判断是否有 `id` 字段来确定匹配是否成功。 + +```java +// 调用地址匹配服务 +JSONObject matchResult = addressMatchProxyService.newMatch(city, address, null, true); + +// 关键:检查是否有id字段 +String id = (matchResult != null) ? matchResult.optString("id") : null; +if (StringUtils.isBlank(id)) { + // 没有id算匹配失败,需要调用标准化拆分 + return handleAddressStructure(city, address); +} + +// 有id表示匹配到具体POI,使用id查询权威数据 +District district = districtService.findById(id); +``` + +**要点**: +- ✅ 有 `id` 字段 → 匹配成功,匹配到具体POI(小区/写字楼/建筑) +- ❌ 无 `id` 字段 → 匹配失败,调用 `addressStructure` 做标准化拆分 + +### 2. 直辖市特殊处理 ⭐⭐⭐ + +**问题**:直辖市的 `addressStructure` 返回结果中,城市名在 `province` 字段,不在 `city` 字段。 + +```java +// addressStructure返回示例(上海): +// { "province": "上海市", "city": "市辖区", "district": "浦东新区" } + +// 正确处理方式 +String province = structureResult.optString("province"); +String cityField = structureResult.optString("city"); + +String structCity; +if (ProvinceData.isGovernmentCity(province)) { + // 直辖市:北京市、上海市、天津市、重庆市 + structCity = province; +} else { + structCity = cityField; +} +``` + +**适用范围**:北京、上海、天津、重庆 + +### 3. 数据来源分离原则 ⭐⭐⭐ + +**核心原则**:展示字段和查询字段使用不同的数据源。 + +```java +// 从匹配结果获取展示用的数据(用户友好格式) +String matchCity = matchResult.optString("city"); // "上海" +String matchDistrict = matchResult.optString("district"); // "浦东" +String matchName = matchResult.optString("name"); + +// 从District对象获取权威数据(用于查询) +String districtCity = district.getCity(); // "上海市" +String districtRegion = district.getRegion(); // "浦东新区" +String districtName = district.getName(); + +// 返回给用户:使用匹配结果的数据 +result.append("city", matchCity); +result.append("district", matchDistrict); +result.append("community_name", matchName); + +// 查询价格和成交数据:使用District对象的权威数据 +DistrictStat latestStat = districtStatService.findOneDistrictStatsSort( + districtCity, districtRegion, districtName, null); +``` + +**为什么分离**: +- 展示数据:用户输入什么格式,返回什么格式("上海" vs "上海市") +- 查询数据:使用数据库中存储的标准格式 + +### 4. 区域价格查询前必须格式化 ⭐⭐⭐ + +**问题**:区域价格查询必须使用城市和区域的简称,否则查不到数据。 + +```java +// 错误示例 ❌ +RegionSellStat stat = regionSellStatService.findNewestRegionPrice( + "上海市", "浦东新区"); // 查不到数据 + +// 正确示例 ✅ +String formattedCity = RegionData.formatCity("上海市"); // "上海" +String formattedRegion = RegionData.formatRegion(formattedCity, "浦东新区"); // "浦东" +RegionSellStat stat = regionSellStatService.findNewestRegionPrice( + formattedCity, formattedRegion); +``` + +**使用场景**: +- 查询区域价格(`RegionSellStatService.findNewestRegionPrice`) +- 任何需要使用城市/区域作为查询条件的场景 + +### 5. Service方法日期参数处理 ⭐⭐ + +**问题**:某些Service方法会直接将日期参数添加到查询条件,传 `null` 可能导致异常。 + +```java +// 错误示例 ❌ +List dealPrices = dealPriceService.findDealPriceList( + city, region, name, startDate, null); // endDate传null可能有问题 + +// 正确示例 ✅ +Date halfYearAgo = new Date(System.currentTimeMillis() - 180L * 24 * 60 * 60 * 1000); +Date now = new Date(); +List dealPrices = dealPriceService.findDealPriceList( + city, region, name, halfYearAgo, now); +``` + +**建议**:始终传入明确的日期值,避免传 `null`。 + +### 6. 价格字段优先级 ⭐⭐ + +**规则**:`avg_price_2b` 字段优先于 `avgPrice` 字段。 + +```java +// DistrictStat中有两个均价字段 +Integer avgPrice = null; +if (latestStat.getAvg_price_2b() != null && latestStat.getAvg_price_2b() > 0) { + avgPrice = latestStat.getAvg_price_2b(); // 优先使用 +} else if (latestStat.getAvgPrice() > 0) { + avgPrice = latestStat.getAvgPrice(); // 降级使用 +} +``` + +**原因**:`avg_price_2b` 是新版价格字段,数据更准确。 + +### 7. category字段判断POI类型 ⭐⭐ + +**规则**:使用 `category` 字段判断匹配结果的类型。 + +```java +String category = matchResult.optString("category"); + +if ("district".equals(category)) { + // 小区 → 输出房价 + result.append("property_type", "住宅"); + // 查询房价和成交数据 +} else if ("office".equals(category)) { + // 写字楼 → 不输出房价 + result.append("property_type", "写字楼"); +} else { + // 其他类型建筑 + String propertyType = matchResult.optString("propertyType"); + result.append("property_type", propertyType); +} +``` + +**常见值**: +- `district` - 小区 +- `office` - 写字楼 +- 其他 - 使用 `propertyType` 字段判断 + +### 8. Controller参数必须使用@Param注解 ⭐ + +**规则**:所有Controller方法参数都需要 `@Param` 注解。 + +```java +import org.sothis.web.mvc.annotation.Param; + +public RestfulModelAndView matchAction( + @Param(name = "address") String address, + @Param(name = "city") String city) { + // ... +} +``` + +**注意**:包路径是 `org.sothis.web.mvc.annotation.Param`,不是Spring的注解。 + +--- + +## 常见问题处理 + +### Q1: 返回数据格式规范 + +**重要**:接口返回的字段名使用**下划线分隔**,不使用驼峰命名。 + +- ✅ 正确:`community_name`, `reference_price`, `typical_total_price` +- ❌ 错误:`communityName`, `referencePrice`, `typicalTotalPrice` + +因此,**不要创建专门的Model类**,直接使用 `UniversalDto` 封装结果: + +```java +UniversalDto result = UniversalDto.newDto(); +result.append("community_name", "陆家嘴花园"); +result.append("city", "上海市"); +result.append("reference_price", 126000); +result.append("update_time", "2026-01-31"); +mav.setModel(BasicModel.buildOKModel().setResult(result)); +``` + +### Q2: 如何处理参数校验? + +手动代码校验,示例见 [development-standards.md](references/development-standards.md) "参数校验" 章节 + +### Q3: 需要配置Spring Bean吗? + +不需要。约定大于配置,只要提供setter方法即可自动注入。 + +### Q4: 本地如何测试? + +```bash +cd deliverables/fangjiaopen +mvn tomcat7:run +# 访问: http://localhost:8032/{controller}/{action}?param=value&token=xxx +``` + +### Q5: 如何构建部署? + +```bash +cd deliverables/fangjiaopen +mvn clean package -Dmaven.test.skip=true +# WAR包位置: target/fangjia-open.war +# 后续通过Jenkins Pipeline自动部署到K8S +``` + +--- + +## 工作流程总结 + +1. **读取需求** → 使用pandoc转换Word/PDF +2. **分析需求** → 提取参数、字段、逻辑 +3. **询问确认** → URL、数据源、Service/DAO +4. **给出建议** → 命名、字段、异常处理 +5. **生成代码** → DAO(如需要) → Service → Controller + - 返回数据使用UniversalDto,字段名用下划线分隔 + - 优先复用现有Service(AddressMatchProxyService、DistrictStatService等) +6. **生成文档** → 使用docx-js生成Word格式API文档(确保样式一致) +7. **接口测试** → 参考 [API测试指南](references/api-testing-guide.md) + +--- + +## 参考资料 + +- **[代码模板](references/code-templates.md)** - Controller、Service代码模板 +- **[开发规范](references/development-standards.md)** - 完整的开发规范文档 +- **[API测试指南](references/api-testing-guide.md)** - 接口测试流程和脚本编写 +- **[数据表参考](references/database-tables.md)** - 常用MongoDB数据表结构和查询方法 +- **API文档模板**:`assets\估家科技开放接口文档-模版.docx` + +--- + +## 常用工具类 + +详见项目根目录下的 `CLAUDE.md` 文件中的"常用工具类"章节。 diff --git a/.claude/skills/fangjia-openapi-dev/assets/估家科技开放接口文档-模版.docx b/.claude/skills/fangjia-openapi-dev/assets/估家科技开放接口文档-模版.docx new file mode 100644 index 0000000000000000000000000000000000000000..1ba63010df9629c8da8ef19a9421a74445c3634d GIT binary patch literal 53701 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 U-hhp1AdmpUqd=# coll = Mongo3Utils.getDbCollection( + Constants.SEAWATER_MONGO_URI, // 已配置好的连接URI + "business", // 数据库 + "open_uri_log" // 集合 +) +``` + +### 2. 使用 projection 优化查询 + +```groovy +// 只查询需要的字段,减少网络传输 +Document query = new Document("user_id", "xxx") + .append("request_uri", "/api/xxx") + +Document projection = new Document("parameter_map", 1).append("_id", 0) + +MongoCursor cursor = coll.find(query) + .projection(projection) // 只返回 parameter_map + .limit(1000) + .iterator() +``` + +### 3. 提取测试参数 + +```groovy +List> excelData = [] +excelData << ["序号", "参数1", "参数2", "参数3"] // 表头 + +int index = 0 +while (cursor.hasNext()) { + Document doc = cursor.next() + Document paramMap = doc.get("parameter_map", Document.class) + + String param1 = paramMap?.getString("param1") ?: "" + String param2 = paramMap?.getString("param2") ?: "" + + excelData << [++index, param1, param2] +} +``` + +### 4. 保存到Excel + +```groovy +import com.fangjia.script.util.ExcelUtils + +// 自动确定脚本所在目录 +String scriptDir = new File(getClass().protectionDomain.codeSource.location.path).parent +String dataDir = new File(scriptDir, "data").absolutePath +new File(dataDir).mkdirs() + +String outputFile = "${dataDir}${File.separator}test_data.xlsx" +ExcelUtils.write(outputFile, excelData, "测试数据") +``` + +## 第二步:编写接口测试脚本 + +**目的**:多线程调用接口,记录结果和性能指标 + +**推荐方法**:使用 `ExcelUtils.multiThreadingModify` 工具类(自动管理线程池和进度监控) + +### 方法一:使用 ExcelUtils.multiThreadingModify(推荐) + +**优势**: +- ✅ 自动管理线程池(CPU核心数×4) +- ✅ 自动处理线程安全 +- ✅ 自动进度监控(每1000条打印进度和百分比) +- ✅ 代码简洁,专注业务逻辑 +- ✅ 超长等待时间(30天),适合大批量测试 + +**完整示例**: + +```groovy +import com.fangjia.core.util.HttpRequest +import com.fangjia.script.util.ExcelUtils +import net.sf.json.JSONObject + +// 1. 准备测试数据和结果Excel +String scriptDir = new File(getClass().protectionDomain.codeSource.location.path).parent +String dataDir = new File(scriptDir, "data").absolutePath +String inputFile = "${dataDir}${File.separator}test_data.xlsx" +String outputFile = "${dataDir}${File.separator}test_result.xlsx" + +// 2. 读取所有数据(包括表头) +List> allData = ExcelUtils.read(inputFile, 0, 0) + +// 3. 修改表头,添加结果列 +allData[0] = ["序号", "参数1", "参数2", "返回字段1", "返回字段2", + "返回字段3", "耗时(ms)", "异常信息"] + +// 4. 为每行数据添加空的结果列 +for (int i = 1; i < allData.size(); i++) { + List row = allData[i] + (3..7).each { row << "" } // 添加5个结果列 +} + +// 5. 写入初始结果文件 +ExcelUtils.write(outputFile, allData, "测试结果") + +// 6. 使用 multiThreadingModify 多线程调用接口 +ExcelUtils.multiThreadingModify(outputFile, { List row -> + HttpRequest request = new HttpRequest() + long startTime = System.currentTimeMillis() + + try { + // 提取参数(row[0]=序号, row[1]=参数1, row[2]=参数2) + String param1 = row[1]?.toString() ?: "" + String param2 = row[2]?.toString() ?: "" + + // 调用接口 + Map params = ["param1": param1, "param2": param2] + String response = request.get("http://localhost:9180/api/xxx", params, "UTF-8") + long duration = System.currentTimeMillis() - startTime + + // 解析响应 + JSONObject json = JSONObject.fromObject(response) + Integer code = json.optInt("code") + JSONObject result = json.optJSONObject("result") + + if (code == 200 && result != null) { + // 成功:填充结果列(直接修改row,工具类自动处理线程安全) + row[3] = result.optString("field1", "") + row[4] = result.optString("field2", "") + row[5] = result.optString("field3", "") + row[6] = duration + row[7] = "" // 无异常 + } else { + // 失败:记录错误信息 + row[6] = duration + row[7] = "接口返回错误(code=${code}): ${json.optString('msg', '')}" + } + + } catch (Exception e) { + // 异常:记录异常信息 + long duration = System.currentTimeMillis() - startTime + row[6] = duration + row[7] = "异常: ${e.class.simpleName} - ${e.message}" + } +}, 0, "测试结果") + +// 7. 读取结果并统计 +List> finalData = ExcelUtils.read(outputFile, 0, 0) +int totalCount = finalData.size() - 1 +int successCount = 0 +int failCount = 0 +long totalTime = 0 + +// 耗时分布统计 +Map timeDist = [ + "<100ms": 0, + "100-200ms": 0, + "200-500ms": 0, + "500-1000ms": 0, + ">1000ms": 0 +] + +for (int i = 1; i < finalData.size(); i++) { + List row = finalData[i] + String errorMsg = row[7]?.toString() ?: "" + + if (errorMsg == "") { + successCount++ + + // 统计耗时 + if (row[6] instanceof Number) { + int duration = ((Number)row[6]).intValue() + totalTime += duration + + if (duration < 100) timeDist["<100ms"]++ + else if (duration < 200) timeDist["100-200ms"]++ + else if (duration < 500) timeDist["200-500ms"]++ + else if (duration < 1000) timeDist["500-1000ms"]++ + else timeDist[">1000ms"]++ + } + } else { + failCount++ + } +} + +// 8. 保存统计数据到新Sheet +List> statsData = [] +statsData << ["统计项", "数值"] +statsData << ["测试时间", new Date().format("yyyy-MM-dd HH:mm:ss")] +statsData << ["", ""] +statsData << ["总测试数", totalCount] +statsData << ["成功数", successCount] +statsData << ["失败数", failCount] +statsData << ["成功率", totalCount > 0 ? String.format('%.2f%%', successCount * 100.0 / totalCount) : '0.00%'] + +if (successCount > 0) { + int avgTime = (totalTime / successCount).intValue() + statsData << ["", ""] + statsData << ["平均耗时(ms)", avgTime] + + // 耗时分布 + statsData << ["", ""] + statsData << ["耗时分布", "数量"] + timeDist.each { range, count -> + statsData << [range, count] + } +} + +// 添加统计Sheet +ExcelUtils.write(outputFile, statsData, "统计数据") + +// 9. 控制台输出统计结果 +println "\n========== 测试完成 ==========" +println "总测试数:${totalCount}" +println "成功数:${successCount}" +println "失败数:${failCount}" +println "成功率:${totalCount > 0 ? String.format('%.2f%%', successCount * 100.0 / totalCount) : '0.00%'}" + +if (successCount > 0) { + int avgTime = (totalTime / successCount).intValue() + println "平均耗时:${avgTime} ms" + + println "\n耗时分布:" + timeDist.each { range, count -> + if (count > 0) { + println " ${range}: ${count} 条" + } + } +} + +println "\n结果文件:${outputFile}" +println " - Sheet1: 测试结果(详细数据)" +println " - Sheet2: 统计数据(汇总信息)" +``` + +### 方法二:手动管理线程池(适合需要自定义控制的场景) + +
+点击展开手动管理线程池的示例代码 + +```groovy +import java.util.concurrent.* +import java.util.concurrent.atomic.AtomicInteger +import com.fangjia.core.util.HttpRequest +import net.sf.json.JSONObject + +// 1. 读取测试数据 +List> testData = ExcelUtils.read(inputFile, 0, 1) // 跳过表头 + +// 2. 准备结果数据 +List> resultData = [] +resultData << ["序号", "参数1", "参数2", "返回字段1", "返回字段2", "耗时(ms)", "异常信息"] +testData.each { row -> + List newRow = [row[0], row[1], row[2]] + (3..6).each { newRow << "" } + resultData << newRow +} + +// 3. 配置线程池 +int nThread = Runtime.getRuntime().availableProcessors() * 4 +ExecutorService executorService = Executors.newFixedThreadPool(nThread) +AtomicInteger counter = new AtomicInteger(0) +AtomicInteger successCounter = new AtomicInteger(0) + +// 4. 提交任务 +testData.eachWithIndex { List testRow, int i -> + final int rowIndex = i + 1 + executorService.submit({ + HttpRequest request = new HttpRequest() + long startTime = System.currentTimeMillis() + + try { + String param1 = testRow[1]?.toString() ?: "" + String response = request.get("http://localhost:9180/api/xxx", + ["param1": param1], "UTF-8") + long duration = System.currentTimeMillis() - startTime + + JSONObject json = JSONObject.fromObject(response) + JSONObject result = json.optJSONObject("result") + + synchronized(resultData) { + if (json.optInt("code") == 200 && result != null) { + resultData[rowIndex][3] = result.optString("field1", "") + resultData[rowIndex][4] = result.optString("field2", "") + resultData[rowIndex][5] = duration + successCounter.incrementAndGet() + } else { + resultData[rowIndex][5] = duration + resultData[rowIndex][6] = "错误: ${json.optString('msg')}" + } + } + } catch (Exception e) { + synchronized(resultData) { + resultData[rowIndex][6] = "异常: ${e.message}" + } + } + + if (counter.incrementAndGet() % 100 == 0) { + println "进度: ${counter.get()}/${testData.size()}" + } + } as Runnable) +} + +// 5. 等待完成并保存结果 +executorService.shutdown() +executorService.awaitTermination(30, TimeUnit.MINUTES) +ExcelUtils.write(outputFile, resultData, "测试结果") +``` +
+ +## 第三步:运行测试流程 + +### 1. 构建项目 +```bash +cd deliverables/script +mvn clean package -Dmaven.test.skip=true +``` + +### 2. 提取测试数据 +```bash +groovy -cp "target/classes;target/classes/lib/*" \ + projects/fangjia-script/src/main/groovy/com/fangjia/script/opentest/XXXTestDataExtractor.groovy +``` + +### 3. 启动fangjia-open服务 +```bash +cd deliverables/fangjiaopen +mvn tomcat7:run +``` + +### 4. 运行接口测试 +```bash +groovy -cp "target/classes;target/classes/lib/*" \ + projects/fangjia-script/src/main/groovy/com/fangjia/script/opentest/XXXInterfaceTest.groovy +``` + +## Excel结果文件结构 + +### 测试数据Excel(单Sheet) + +| 列 | 字段 | 说明 | +|----|------|------| +| A | 序号 | 1-N | +| B | 参数1 | 接口输入参数 | +| C | 参数2 | 接口输入参数 | +| ... | ... | 更多参数 | + +### 测试结果Excel(多Sheet) + +#### 📄 Sheet1: 测试结果(详细数据) + +| 列 | 字段 | 说明 | +|----|------|------| +| A | 序号 | 同测试数据 | +| B | 参数1 | 同测试数据 | +| C | 参数2 | 同测试数据 | +| D | 返回字段1 | 接口返回结果 | +| E | 返回字段2 | 接口返回结果 | +| ... | ... | 更多返回字段 | +| N | 耗时(ms) | 接口调用耗时 | +| N+1 | 异常信息 | 错误时记录 | + +#### 📊 Sheet2: 统计数据(汇总信息) + +| 列 | 字段 | 说明 | +|----|------|------| +| A | 统计项 | 统计项名称 | +| B | 数值 | 统计值 | + +统计内容包括: +- 测试时间(测试执行的时间戳) +- 总测试数、成功数、失败数、成功率 +- 平均耗时(仅统计成功的请求) +- 耗时分布(<100ms、100-200ms、200-500ms、500-1000ms、>1000ms) + +示例: +``` +| 统计项 | 数值 | +|----------------|----------------------| +| 测试时间 | 2026-02-26 14:30:15 | +| | | +| 总测试数 | 1000 | +| 成功数 | 980 | +| 失败数 | 20 | +| 成功率 | 98.00% | +| | | +| 平均耗时(ms) | 245 | +| | | +| 耗时分布 | 数量 | +| <100ms | 120 | +| 100-200ms | 350 | +| 200-500ms | 480 | +| 500-1000ms | 30 | +| >1000ms | 0 | +``` + +## 测试脚本最佳实践 + +### ✅ 推荐做法 + +1. **MongoDB查询优化** + - 使用 `Mongo3Utils` 而非旧版 `MongoUtils` + - 使用 `projection` 只查询需要的字段 + - 使用 `Constants` 中的预定义URI + +2. **路径处理** + - 使用相对路径而非硬编码 + - 脚本自动识别所在目录:`new File(getClass().protectionDomain.codeSource.location.path).parent` + +3. **多线程测试(强烈推荐)** + - **优先使用** `ExcelUtils.multiThreadingModify` 工具方法 + - 自动管理线程池(CPU核心数×4) + - 自动处理线程安全(无需手动 synchronized) + - 自动进度监控(每1000条打印进度和百分比) + - 代码简洁,专注业务逻辑 + +4. **进度监控** + - 使用工具类自动监控(推荐) + - 或手动实现:每100条打印进度,包含时间戳 + +5. **异常处理** + - 捕获所有异常 + - 记录到Excel而非终止程序 + - 异常信息包含类型和消息 + +6. **统计数据保存** + - 使用 `ExcelUtils.write(outputFile, statsData, "统计数据")` 创建统计Sheet + - 统计内容包括:测试时间、成功率、平均耗时、耗时分布 + - 方便后续分析和生成测试报告 + +### ❌ 避免做法 + +1. ❌ 硬编码文件路径(如 `D:\test\data.xlsx`) +2. ❌ 查询所有字段而不使用 projection +3. ❌ 使用旧版 MongoDB API(`DBObject`、`BasicDBObject`) +4. ❌ 单线程测试大量数据 +5. ❌ 异常时终止整个测试 +6. ❌ 手动管理线程池(除非有特殊需求,否则用工具类) +7. ❌ 忘记处理线程安全问题(使用工具类可避免) + +## 测试完成后的分析 + +测试完成后,Excel文件包含两个Sheet,便于多维度分析: + +### 📊 使用统计数据Sheet快速分析 + +1. **成功率分析**:查看成功率是否 >95% + - 低于95%需要排查失败原因 + - 在"测试结果"Sheet中过滤"异常信息"列查看失败详情 + +2. **性能分析**:查看平均耗时和耗时分布 + - 平均耗时应 <500ms(根据业务要求调整) + - 耗时分布帮助识别性能瓶颈 + - 如果 >1000ms 的数量较多,需优化接口性能 + +3. **异常分析**:在"测试结果"Sheet中 + - 使用Excel筛选功能查看所有失败记录 + - 统计异常类型(如超时、参数错误、业务异常等) + - 针对高频异常进行优化 + +4. **数据质量分析**:在"测试结果"Sheet中 + - 检查返回字段的完整性(是否有大量空值) + - 检查价格、匹配级别等核心字段的填充率 + - 对比不同匹配级别的数据分布 + +### 💡 建议 + +- 将统计数据Sheet制作成Excel图表(饼图、柱状图)便于可视化分析 +- 保存多次测试结果,对比性能变化趋势 +- 将测试报告作为接口验收的依据 diff --git a/.claude/skills/fangjia-openapi-dev/references/code-templates.md b/.claude/skills/fangjia-openapi-dev/references/code-templates.md new file mode 100644 index 000000000..3dd90e502 --- /dev/null +++ b/.claude/skills/fangjia-openapi-dev/references/code-templates.md @@ -0,0 +1,201 @@ +# OpenAPI 接口开发代码模板 + +## Controller 模板 + +```java +package com.fangjia.open.controllers; + +import com.fangjia.open.model.*; +import com.fangjia.service.{业务模块}.{Service名称}; +import com.fangjia.open.interceptors.Authority; +import com.fangjia.open.interceptors.Role; +import org.apache.commons.lang.StringUtils; + +@Authority(role = Role.USER) +public class {Controller名称}Controller { + + private {Service名称} {service实例名}; + + // Spring依赖注入(约定大于配置) + public void set{Service名称}({Service名称} {service实例名}) { + this.{service实例名} = {service实例名}; + } + + /** + * {接口功能描述} + * URL: /{controller路径}/{方法名} + */ + @Authority(role = Role.USER) + public Object {方法名}Action({Model名称} model) { + RestfulModelAndView mav = new RestfulModelAndView(); + + // 参数校验 + if (StringUtils.isBlank(model.get{必填字段}())) { + mav.setModel(BasicModel.buildBadRequestModel("{字段}不能为空")); + return mav; + } + + // 调用Service + {Result类型} result = {service实例名}.{service方法}(model); + + // 封装返回结果 + if (result != null) { + // 情况1: 有专用DTO类 + mav.setModel(BasicModel.buildOKModel().setResult(result)); + + // 情况2: 使用UniversalDto + // UniversalDto dto = UniversalDto.newDto(); + // dto.append("fieldName1", result.getValue1()); + // dto.append("fieldName2", result.getValue2()); + // mav.setModel(BasicModel.buildOKModel().setResult(dto)); + } else { + mav.setModel(BasicModel.buildBadRequestModel("未找到数据")); + } + + return mav; + } +} +``` + +## Service 接口模板 + +```java +package com.fangjia.service.{业务模块}; + +import com.fangjia.open.model.{Model名称}; +import {Result类的包路径}.{Result类名}; + +/** + * {Service功能描述} + */ +public interface {Service名称} { + + /** + * {方法功能描述} + * @param model 输入参数 + * @return {返回值描述} + */ + {Result类型} {方法名}({Model名称} model); +} +``` + +## Service 实现类模板 + +```java +package com.fangjia.service.{业务模块}; + +import com.fangjia.dal.{DAO包路径}.{DAO名称}; +import com.fangjia.open.model.{Model名称}; +import {Result类的包路径}.{Result类名}; + +/** + * {Service功能描述}实现类 + */ +public class {Service名称}Impl implements {Service名称} { + + private {DAO名称} {dao实例名}; + + // Spring依赖注入 + public void set{DAO名称}({DAO名称} {dao实例名}) { + this.{dao实例名} = {dao实例名}; + } + + @Override + public {Result类型} {方法名}({Model名称} model) { + // 业务逻辑实现 + // 示例:从DAO查询数据 + {Result类型} result = {dao实例名}.findBy{查询条件}( + model.get{字段1}(), + model.get{字段2}() + ); + + // 数据处理 + if (result != null) { + // 可以进行额外的业务处理 + // result.setXxx(...); + } + + return result; + } +} +``` + +## Model 类模板 + +```java +package com.fangjia.open.model; + +/** + * {接口名称}输入参数Model + */ +public class {Model名称} { + + private String {字段1}; + private String {字段2}; + private Integer {字段3}; + // ... 其他字段 + + // Getter和Setter方法 + public String get{字段1}() { + return {字段1}; + } + + public void set{字段1}(String {字段1}) { + this.{字段1} = {字段1}; + } + + public String get{字段2}() { + return {字段2}; + } + + public void set{字段2}(String {字段2}) { + this.{字段2} = {字段2}; + } + + public Integer get{字段3}() { + return {字段3}; + } + + public void set{字段3}(Integer {字段3}) { + this.{字段3} = {字段3}; + } + + // ... 其他getter/setter +} +``` + +## 使用 UniversalDto 封装示例 + +```java +// 当没有专用的Result DTO类时,使用UniversalDto +UniversalDto dto = UniversalDto.newDto(); +dto.append("communityName", "陆家嘴花园"); +dto.append("city", "上海市"); +dto.append("district", "浦东新区"); +dto.append("referencePrice", 126000); +dto.append("updateTime", "2026-01-31"); + +mav.setModel(BasicModel.buildOKModel().setResult(dto)); +``` + +## 常见返回格式 + +```java +// 成功返回(有数据) +mav.setModel(BasicModel.buildOKModel().setResult(result)); + +// 成功返回(无数据) +mav.setModel(BasicModel.buildOKModel()); + +// 参数错误 +mav.setModel(BasicModel.buildBadRequestModel("参数错误信息")); + +// 未授权 +mav.setModel(BasicModel.buildUnAuthorizedModel()); + +// 服务器错误 +mav.setModel(BasicModel.buildServerErrorModel()); + +// 自定义错误码 +mav.setModel(BasicModel.buildModel(错误码, "错误信息")); +``` diff --git a/.claude/skills/fangjia-openapi-dev/references/database-tables.md b/.claude/skills/fangjia-openapi-dev/references/database-tables.md new file mode 100644 index 000000000..9de18cd09 --- /dev/null +++ b/.claude/skills/fangjia-openapi-dev/references/database-tables.md @@ -0,0 +1,304 @@ +# 常用数据表参考 + +本文档记录开发OpenAPI接口时常用的数据表结构和用途,便于快速查询和复用。 + +## 数据库命名规范 + +### @Table 注解格式 + +在 `fangjia-dal` 的实体类中,MongoDB 集合通过 JPA 的 `@Table` 注解来指定: + +```java +@Entity +@Table(name = "database.collection") +public class YourEntity implements MongoEntity { + // ... +} +``` + +**重要规则**: +- **点之前**(`.`前):**数据库名**(database) +- **点之后**(`.`后):**集合名**(collection) +- 不同的数据库对应不同的 MongoDB URI 常量 + +### 数据库与 URI 常量的对应关系 + +| 数据库名 | MongoDB URI 常量 | 服务器地址 | 用途 | +|---------|-----------------|-----------|------| +| `business` | `Constants.SEAWATER_MONGO_URI` | 192.168.0.206:27020 | 业务日志、开放平台相关 | +| `fangjia` | `Constants.FANGJIA_MONGO_URI` | mongo.db.fangjia.com:28017 | 核心业务数据 | +| `fangjia_stat` | `Constants.FANGJIA_MONGO_URI` | mongo.db.fangjia.com:28017 | 统计数据 | +| `address_analytics` | `Constants.FANGJIA_MONGO_URI` | mongo.db.fangjia.com:28017 | 地址分析数据 | + +**示例**: +```java +// business.open_uri_log → business 数据库 → 使用 SEAWATER_MONGO_URI +@Table(name = "business.open_uri_log") + +// fangjia_stat.district_stat → fangjia_stat 数据库 → 使用 FANGJIA_MONGO_URI +@Table(name = "fangjia_stat.district_stat") + +// fangjia.seaweed → fangjia 数据库,seaweed 集合 → 使用 FANGJIA_MONGO_URI +@Table(name = "fangjia.seaweed") +``` + +--- + +## MongoDB数据表 + +### 1. business.open_uri_log + +**服务器**:192.168.0.206 (通过 `Constants.SEAWATER_MONGO_URI` 连接) + +**作用**:记录所有开放平台API的调用日志,包含请求参数、返回结果等 + +**常用字段**: +| 字段名 | 类型 | 说明 | +|-------|------|------| +| `user_id` | String | 调用用户ID | +| `request_uri` | String | 请求的API路径(如 `/address/risk`) | +| `parameter_map` | Document | 请求参数(嵌套文档) | +| `res_map` | Document | 返回结果(嵌套文档) | +| `c_date` | Date | 创建时间 | + +**连接方式**: +```groovy +import com.fangjia.core.Constants +import com.fangjia.core.util.Mongo3Utils + +MongoCollection coll = Mongo3Utils.getDbCollection( + Constants.SEAWATER_MONGO_URI, + "business", + "open_uri_log" +) +``` + +**典型查询**: +```groovy +// 查询特定用户的API调用记录 +Document query = new Document("user_id", "1007569") + .append("request_uri", "/address/risk") + +// 使用projection优化查询 +Document projection = new Document("parameter_map", 1).append("_id", 0) +MongoCursor cursor = coll.find(query) + .projection(projection) + .limit(1000) + .iterator() +``` + +**使用场景**: +- 提取历史调用数据用于接口测试 +- 分析API调用量和参数分布 +- 排查接口调用问题 + +--- + +### 2. fangjia_stat.district_stat + +**数据库**:fangjia_stat (通过 `Constants.FANGJIA_MONGO_URI` 连接) +**集合名**:district_stat + +**作用**:存储小区级别的价格统计数据 + +**常用字段**: +| 字段名 | 类型 | 说明 | +|-------|------|------| +| `city` | String | 城市 | +| `region` | String | 区域 | +| `name` | String | 小区名称 | +| `avg_price_2b` | Integer | 均价(优先使用,元/平米) | +| `avgPrice` | Integer | 均价(备选,元/平米) | +| `weekend` | Date | 数据更新时间 | + +**典型查询**: +```groovy +// 通过DistrictStatService查询 +DistrictStat latestStat = districtStatService.findOneDistrictStatsSort( + city, region, name, null +) + +// 优先使用avg_price_2b +Integer avgPrice = null +if (latestStat.getAvg_price_2b() != null && latestStat.getAvg_price_2b() > 0) { + avgPrice = latestStat.getAvg_price_2b() +} else if (latestStat.getAvgPrice() > 0) { + avgPrice = latestStat.getAvgPrice() +} +``` + +**使用场景**: +- 查询小区参考均价 +- E基金地址匹配接口返回参考价格 +- 房价评估相关接口 + +--- + +### 3. fangjia.deal_price + +**数据库**:fangjia (通过 `Constants.FANGJIA_MONGO_URI` 连接) +**集合名**:deal_price + +**作用**:存储房产成交记录 + +**常用字段**: +| 字段名 | 类型 | 说明 | +|-------|------|------| +| `city` | String | 城市 | +| `region` | String | 区域 | +| `name` | String | 小区名称 | +| `avgPrice` | Integer | 成交单价(元/平米) | +| `totalPrice` | Integer | 成交总价(万元) | +| 成交时间 | Date | 成交日期 | + +**典型查询**: +```groovy +// 通过DealPriceService查询近半年成交记录 +Date halfYearAgo = new Date(System.currentTimeMillis() - 180L * 24 * 60 * 60 * 1000) +Date now = new Date() + +List dealPrices = dealPriceService.findDealPriceList( + city, region, name, halfYearAgo, now +) + +// 找到单价最接近参考均价的成交记录 +DealPrice closestDeal = null +int minDiff = Integer.MAX_VALUE +for (DealPrice deal : dealPrices) { + if (deal.getAvgPrice() != null && deal.getTotalPrice() != null) { + int diff = Math.abs(deal.getAvgPrice() - referencePrice) + if (diff < minDiff) { + minDiff = diff + closestDeal = deal + } + } +} +``` + +**使用场景**: +- 查询成交记录 +- 计算典型总价(最接近参考均价的成交总价) +- 成交数据分析 + +--- + +### 4. fangjia_stat.region_sell_stat + +**数据库**:fangjia_stat (通过 `Constants.FANGJIA_MONGO_URI` 连接) +**集合名**:region_sell_stat + +**作用**:存储区域级别的销售价格统计 + +**常用字段**: +| 字段名 | 类型 | 说明 | +|-------|------|------| +| `city` | String | 城市(简称格式) | +| `region` | String | 区域(简称格式) | +| `avgPrice` | Integer | 区域均价(元/平米) | +| `date` | Integer | 数据日期(yyyyMM格式) | +| `updateDate` | Date | 更新时间 | + +**典型查询**: +```groovy +// 需要先格式化城市和区域为简称 +String formattedCity = RegionData.formatCity(city) +String formattedRegion = RegionData.formatRegion(formattedCity, district) + +// 通过RegionSellStatService查询最新区域价格 +RegionSellStat regionSellStat = regionSellStatService.findNewestRegionPrice( + formattedCity, formattedRegion +) + +if (regionSellStat != null && regionSellStat.getAvgPrice() != null) { + Integer avgPrice = regionSellStat.getAvgPrice() + // 格式化日期 + String updateTime = DateUtil.formatByPattern( + DateUtil.parseDate(regionSellStat.getDate().toString(), "yyyyMM"), + "yyyy-MM-dd" + ) +} +``` + +**使用场景**: +- 查询区域级别参考价格 +- 地址匹配失败时返回区域价格 +- 区域价格趋势分析 + +--- + +### 5. fangjia.seaweed + +**数据库**:fangjia (通过 `Constants.FANGJIA_MONGO_URI` 连接) +**集合名**:seaweed (实体类为 District,通过 @DatastoreCategory("district") 标识) + +**作用**:存储小区、写字楼等建筑的基础信息(权威数据源) + +**常用字段**: +| 字段名 | 类型 | 说明 | +|-------|------|------| +| `_id` | ObjectId | 小区唯一标识 | +| `city` | String | 城市 | +| `region` | String | 区域 | +| `name` | String | 小区/建筑名称 | +| `cat` | String | 分类(district=小区, office=写字楼) | +| `estate_type2` | String | 物业类型 | + +**典型查询**: +```groovy +// 通过DistrictService根据ID查询 +District district = districtService.findById(id) + +if (district != null) { + String city = district.getCity() + String region = district.getRegion() + String name = district.getName() +} +``` + +**使用场景**: +- 根据ID查询小区权威信息 +- 获取小区的城市、区域、名称用于后续查询 +- 验证POI信息的准确性 + +--- + +## 如何记录新数据表 + +**遇到新数据表时,请主动询问用户是否需要记录,格式如下:** + +> 我在开发过程中用到了数据表 `XXX.YYY`,是否需要记录到技能文档中供以后复用? +> +> 如果需要,请告诉我: +> 1. 这个表的主要作用 +> 2. 常用的查询场景 +> 3. 是否有特殊的查询方式或注意事项 + +**记录模板**: + +```markdown +### N. database.table_name + +**服务器/数据库**:服务器地址或数据库类型 + +**作用**:简要说明表的用途 + +**常用字段**: +| 字段名 | 类型 | 说明 | +|-------|------|------| +| `field1` | Type | 说明 | +| `field2` | Type | 说明 | + +**连接方式**:(如果有特殊连接方式) +```groovy +// 代码示例 +``` + +**典型查询**: +```groovy +// 常用查询示例 +``` + +**使用场景**: +- 场景1 +- 场景2 +``` diff --git a/.claude/skills/fangjia-openapi-dev/references/development-standards.md b/.claude/skills/fangjia-openapi-dev/references/development-standards.md new file mode 100644 index 000000000..894ec6a25 --- /dev/null +++ b/.claude/skills/fangjia-openapi-dev/references/development-standards.md @@ -0,0 +1,190 @@ +# OpenAPI 开发规范 + +## 项目结构 + +### Controller层 +- **位置**: `projects/fangjia-open/src/main/java/com/fangjia/open/controllers/` +- **命名**: `{业务名}Controller.java` +- **方法命名**: `{方法名}Action` +- **URL映射**: `/{controller路径}/{方法名}` + - 示例: `PropertyController.priceQueryAction` → `/property/priceQuery` + +### Service层 +- **位置**: `projects/fangjia-service/src/main/java/com/fangjia/service/{业务模块}/` +- **命名**: + - 接口: `{Service名}.java` + - 实现: `{Service名}Impl.java` +- **结构**: 必须有接口 + 实现类 + +### Model层 +- **位置**: `projects/fangjia-open/src/main/java/com/fangjia/open/model/` +- **命名**: `{功能名}Model.java` +- **内容**: 输入参数的POJO类,包含getter/setter方法 + +### DAO层 +- **位置**: `projects/fangjia-dal/src/main/java/com/fangjia/dal/` +- **原则**: 优先使用已有DAO,需要时再新建 +- **基类**: + - MongoDB: `AbstractMongoDao` + - MySQL: `AbstractSqlDao` + - JPA: `AbstractJpaCompatibleDao` + +## 依赖注入规范 + +### 约定大于配置 +- **不需要**使用注解(@Service, @Autowired等) +- **不需要**手动配置Spring Bean XML +- **只需要**提供setter方法,Spring会自动注入 + +### 示例 + +```java +public class PropertyController { + private PropertyService propertyService; + + // 提供setter方法即可,无需注解 + public void setPropertyService(PropertyService propertyService) { + this.propertyService = propertyService; + } +} +``` + +## 参数校验 + +### 手动代码校验 +- 使用 `StringUtils.isBlank()` 检查字符串 +- 使用 `if` 语句进行逻辑判断 +- **不使用** `@Valid` 注解或 JSR303 校验 + +### 示例 + +```java +// 必填参数校验 +if (StringUtils.isBlank(model.getCity())) { + mav.setModel(BasicModel.buildBadRequestModel("城市不能为空")); + return mav; +} + +// 数值范围校验 +if (model.getSize() != null && model.getSize() <= 0) { + mav.setModel(BasicModel.buildBadRequestModel("面积必须大于0")); + return mav; +} +``` + +## 异常处理 + +### 统一异常处理 +- **不需要**手动 try-catch +- 框架已有统一异常处理机制 +- 直接调用Service方法即可 + +```java +// 正确 - 不需要try-catch +PropertyResult result = propertyService.queryPrice(model); + +// 错误 - 不要这样写 +// try { +// PropertyResult result = propertyService.queryPrice(model); +// } catch (Exception e) { +// ... +// } +``` + +## 返回值规范 + +### 统一返回格式 + +所有接口返回 `RestfulModelAndView` 对象: + +```java +RestfulModelAndView mav = new RestfulModelAndView(); +``` + +### 设置返回内容 + +使用 `BasicModel` 构建返回对象: + +```java +// 成功 - 返回数据 +mav.setModel(BasicModel.buildOKModel().setResult(data)); + +// 成功 - 无数据 +mav.setModel(BasicModel.buildOKModel()); + +// 失败 - 参数错误 +mav.setModel(BasicModel.buildBadRequestModel("错误描述")); +``` + +### JSON格式 + +返回的JSON格式: +```json +{ + "code": 200, + "msg": "ok", + "result": { + // 实际数据 + } +} +``` + +## 编码规范 + +| 项目 | 规范 | +|-----|------| +| **字符编码** | UTF-8 | +| **命名风格** | 驼峰命名法(camelCase) | +| **参数大小写** | 大小写敏感 | +| **URL大小写** | 大小写敏感 | + +## 认证授权 + +### Token认证 +- 所有接口方法需要添加 `@Authority(role = Role.USER)` +- 调用时必须传递 `token` 参数 +- Token有效期:2小时 + +```java +@Authority(role = Role.USER) +public class PropertyController { + + @Authority(role = Role.USER) + public Object priceQueryAction(PropertyQueryModel model) { + // ... + } +} +``` + +## 本地测试(可选) + +```bash +cd deliverables/fangjiaopen +mvn tomcat7:run +``` + +访问地址:`http://localhost:8032/{controller}/{action}?param1=value1&token=xxx` + +## 构建打包 + +```bash +cd deliverables/fangjiaopen +mvn clean package -Dmaven.test.skip=true +``` + +产物位置:`deliverables/fangjiaopen/target/fangjia-open.war` + +## 部署流程 + +1. **构建**: Maven打包生成WAR文件 +2. **Docker**: Jenkins Pipeline构建Docker镜像 +3. **推送**: 推送到镜像仓库 `192.168.0.19:9011` +4. **部署**: K8S自动部署 + +## 不需要的功能 + +- ❌ 不需要限流 +- ❌ 不需要缓存配置(除非特殊说明) +- ❌ 不需要写日志(有统一日志处理) +- ❌ 不需要手动try-catch +- ❌ 不需要配置Spring Bean XML diff --git a/.gitignore b/.gitignore index 187362488..838aa4dac 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ deliverables/*/.idea *.idea* classes **/sdklog/* +/${APPDATA} +/projects/fangjia-script/src/main/groovy/com/fangjia/script/opentest/data diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 000000000..c84e5c34b --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,424 @@ +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +## 项目概述 + +这是一个房地产信息平台的Java代码仓库,采用Maven多模块管理。本文档聚焦于四个核心可交付项目及其相关模块。 + +## 核心可交付项目 + +### 1. deliverables/fangjia - 房价核心系统 +主要的房价查询和展示系统,包含以下模块: +- **fangjia-core**: 核心工具类和基础框架 +- **fangjia-dal**: 数据访问层(DAL) +- **fangjia-service**: 业务服务层 +- **fangjia-coresite**: 核心网站Web层(WAR包) +- **chafangtong-dal**: 查房通数据访问层 +- **fangjia-static**: 静态资源服务 +- **fangjia-script**: 脚本工具集 + +**打包产物**: fangjia-coresite.war + +### 2. deliverables/fangjiaopen - 开放API系统 +对外提供的RESTful API接口系统,包含以下模块: +- **fangjia-core**: 核心工具类 +- **fangjia-dal**: 房价数据访问层 +- **fangjia-service**: 房价业务服务 +- **chafangtong-dal**: 查房通数据访问层 +- **fangjia-loan-dal**: 房贷数据访问层 +- **fangjia-loan-service**: 房贷业务服务 +- **fangjia-open**: 开放API Web层(WAR包) + +**打包产物**: fangjia-open.war +**本地开发端口**: 8032 (通过tomcat7-maven-plugin) + +### 3. deliverables/fangjiastatic - 静态资源服务 +静态文件托管服务,包含以下模块: +- **fangjia-core**: 核心工具类 +- **fangjia-static**: 静态资源Web层(WAR包) + +**打包产物**: fangjia-static.war + +### 4. deliverables/script - 脚本工具集 +数据处理、爬虫、分析等维护脚本集合,包含以下模块: +- **fangjia-core**: 核心工具类 +- **fangjia-script**: Groovy脚本集合(JAR包) + +**打包产物**: fangjia-script.jar + +## 核心模块详解 + +### fangjia-core +所有项目的基础依赖模块,包含通用工具类和基础配置。 + +### fangjia-dal +数据访问层,提供DAO实现: +- 位置: `projects/fangjia-dal/src/main/java/com/fangjia/dal/` +- 基类: `AbstractEntityDao`, `AbstractJpaCompatibleDao`, `AbstractMongoDao`, `AbstractSqlDao` +- 数据库: MySQL + MongoDB混合存储 + +### fangjia-service +业务服务层,实现核心业务逻辑: +- 位置: `projects/fangjia-service/src/main/java/com/fangjia/service/` +- 包结构: address, auto, bkoff, city, chart等业务模块 +- 依赖: fangjia-dal + +### fangjia-coresite +核心网站Web层,房价信息展示的主要入口: +- 打包: WAR文件 +- 框架: Spring 3.0.5 + Sothis Web + Freemarker +- Docker镜像: 192.168.0.19:9011/fangjia-coresite + +### fangjia-open +开放API接口层: +- 打包: WAR文件 +- 技术栈: Apache CXF 2.2.3(Web服务), Redis(缓存), Groovy支持 +- 功能: 对外提供RESTful API和SOAP Web Service +- 特色依赖: JFreeChart(图表生成), xhtmlrenderer(HTML转PDF) + +### fangjia-static +静态资源服务: +- 打包: WAR文件 +- 极简依赖: 仅包含Sothis框架和Commons-IO +- 用途: 托管静态文件(图片、CSS、JS等) + +### fangjia-script +Groovy脚本集合,包含大量数据处理脚本: +- 打包: JAR文件(包含所有依赖到lib目录) +- 语言: Groovy 2.4.13 +- Java版本: 1.8 (其他模块多为1.6) +- 主要脚本类别: + - **数据导入导出**: dataImport, dataExport, backup + - **爬虫**: crawl, webCrawl, sampleSpider, thirdPriceCrawl + - **数据分析**: dataAna, analy, statistic, searchanalysis + - **批处理任务**: BaseBatch.groovy, BatchOwner.groovy + - **第三方集成**: baidu, dianping, aliyun + - **数据同步**: sync, datastore + - **工具脚本**: tool, util, temp(临时脚本) + +脚本位置: `projects/fangjia-script/src/main/groovy/com/fangjia/script/` + +## 构建和开发命令 + +### 构建单个项目 + +所有构建命令在 `deliverables/` 目录下执行: + +```bash +# 构建fangjia核心系统 +cd deliverables/fangjia +mvn clean package -Dmaven.test.skip=true + +# 构建开放API系统 +cd deliverables/fangjiaopen +mvn clean package -Dmaven.test.skip=true + +# 构建静态资源服务 +cd deliverables/fangjiastatic +mvn clean package -Dmaven.test.skip=true + +# 构建脚本工具集 +cd deliverables/script +mvn clean package -Dmaven.test.skip=true +``` + +### 本地运行fangjia-open + +```bash +cd deliverables/fangjiaopen +mvn tomcat7:run +# 访问 http://localhost:8032 +``` + +### 生成Eclipse项目文件 + +```bash +cd deliverables/ +mvn eclipse:clean +mvn eclipse:eclipse -Dwtpversion=1.0 -DdownloadSources=true +``` + +### 运行Groovy脚本 + +```bash +cd deliverables/script +mvn package # 先打包生成jar和依赖 +# 然后执行特定脚本 +groovy -cp "target/classes:target/classes/lib/*" +``` + +## 字符编码 + +**重要**: 所有核心模块现在统一使用 UTF-8 编码: + +| 模块 | 编码格式 | +|-----|---------| +| fangjia-coresite | UTF-8 | +| fangjia-open | UTF-8 | +| fangjia-script | UTF-8 | +| fangjia-static | UTF-8 | + +## 技术栈 + +### Web应用 (fangjia-coresite, fangjia-open, fangjia-static) +- **Java**: 1.6 +- **Spring**: 3.0.5.RELEASE +- **Hibernate**: 4.0.1.Final (JPA) +- **Sothis Framework**: 0.1.0/0.2.0-SNAPSHOT (自研Web框架) +- **模板引擎**: Freemarker 2.3.16+ +- **Web容器**: Tomcat 6 +- **数据库**: MySQL 5.x, MongoDB +- **缓存**: Redis (仅fangjia-open) + +### 脚本工具 (fangjia-script) +- **Java**: 1.8 +- **Groovy**: 2.4.13 +- **数据库**: MySQL, Oracle, PostgreSQL, ClickHouse, Elasticsearch +- **消息队列**: ActiveMQ 5.5.0, RabbitMQ 4.12.0 +- **爬虫**: Selenium 3.14.0, HttpClient, Jsoup +- **数据处理**: Apache POI, EasyExcel, Apache Commons +- **分析**: Apache Mahout 0.5, JFreeChart +- **全文搜索**: Solr 3.5.0, IK Analyzer +- **OCR**: Tess4j 3.4.0 + +### 公共依赖 +- Google Guava (版本在不同模块间有差异: r09, 19.0, 22.0) +- Apache Commons系列 (lang, codec, collections, io, email等) +- SLF4J + Log4j (日志) + +## 部署流程 + +使用Jenkins Pipeline自动化部署(见Jenkinsfile): + +1. **Git Checkout**: 从GitLab拉取代码 +2. **Maven Build**: 在deliverables目录下构建 +3. **Docker Build**: 构建镜像并推送到 192.168.0.19:9011 +4. **K8S Deploy**: 应用Kubernetes配置 + +### Docker镜像 +每个Web项目都有对应的Dockerfile: +- `projects/fangjia-coresite/Dockerfile` → fangjia-coresite镜像 +- `projects/fangjia-open/Dockerfile` → fangjia-open镜像 +- `projects/fangjia-static/Dockerfile` → fangjia-static镜像 + +标准格式: +```dockerfile +FROM 192.168.0.19:9012/tomcat6:220713 +COPY target/*.war /home/goojia/webapps/ROOT.war +``` + +## 常用工具类 + +### fangjia-script 工具类 (Groovy) +位于 `projects/fangjia-script/src/main/groovy/com/fangjia/script/util/` + +**ExcelUtils** - Excel读写处理,支持并发 +- `read(file, sheetIndex=0, skipRow=1)` - 读取Excel为List +- `write(fileName, data, sheetName)` - 写入数据到Excel +- `multiThreadingModify(fileName, closure, sheetIndex, destSheetName)` - 多线程修改(CPU核心数x4) +- `distinct(inputFile, rowIndexs, sheetIndex)` - 按列去重 +- `filter(fileName, closure, sheetIndex)` - 按条件过滤行 + +**CsvUtils** - CSV文件处理 +- `read(file, skipFirstLine=true)` - 读取CSV为List +- `write(file, data)` - 写入数据到CSV + +**ElasticUtils** - Elasticsearch操作 +- `getClient(host)` - 获取ES客户端 +- `executeSimpleQuery(host, indexName, queryBuilder)` - 执行查询 +- `modify(id, map, host, indexName)` - 更新文档 + +**JacksonUtil** - JSON序列化 +- `jsonToBean(jsonString, resultClass)` - JSON转对象(自动忽略未知属性) +- `jsonToList(jsonString, elementClass)` - JSON转List +- `getMapper(ignoreUnknownProperties)` - 获取ObjectMapper + +**GeoUtils** (Groovy) - 地理位置计算 +- `calculateDistance(lng1, lat1, lng2, lat2)` - 计算两点距离(米) +- `geoconvBaiduToGoogle(lng, lat)` - 百度坐标转谷歌坐标 + +**DESUtil** - DES加密 +- `encrypt(data, secretKey)` - 加密字符串 +- `decrypt(encryptedData, secretKey)` - 解密字符串 +- `generateKey()` - 生成密钥 + +**DbUtils** - MongoDB操作(Groovy) +- `executeQueryOnline(collName, query, closure, fields)` - 线上库查询 +- `seaweed` / `seabird` - 预定义的常用Collection + +### fangjia-core 工具类 (Java) +位于 `projects/fangjia-core/src/main/java/com/fangjia/core/util/` + +**StringUtil** - 字符串处理 +- `getFirstSpell(spell, upCase)` - 获取首字母拼音 +- `cutString(targetString, targetLength)` - 截断字符串 +- `isDirtyWord(word)` - 脏词检测 + +**Mongo3Utils** - MongoDB 3.6+ 客户端 +- `getMongoClient(uri)` - 获取MongoClient(带连接池) +- `getDbCollection(uri, db, collection)` - 获取MongoCollection + +**MongoUtils** - MongoDB旧版API +- `getDbCollection(db, name)` - 获取DBCollection +- `getDbCollection(uri, db, name)` - 带URI的获取方式 +- 常量: `MongoDB_Domain_mongo`, `MongoDB_Domain_artemis` 等 + +**GeoUtils** (Java) - 地理位置计算 +- `calculateDistance(lng1, lat1, lng2, lat2, gaussSphere)` - 计算距离(支持不同坐标系) +- `geoconvBaiduToGoogle(lng, lat)` - 百度转谷歌坐标 + +**DataUtil** - 数据处理 +- `getPinyin(chinese)` - 汉字转拼音 +- `cleanString(str)` - 清理特殊字符 +- `roundDouble(value, scale)` - 四舍五入 +- `cellPhonePattern` - 手机号正则 + +**DateUtil** - 日期处理 +- `formatDate(date, pattern)` - 日期格式化 +- `parseDate(dateStr, pattern)` - 字符串解析为日期 +- `getBeforeDay(date, days)` - 获取N天前/后的日期 +- `truncateDay(date)` - 截断到日期(去除时分秒) + +**HttpRequest** - HTTP请求 +- `sendGet(url, params)` - 发送GET请求 +- `sendPost(url, params)` - 发送POST请求 +- `get(url, charset)` / `post(url, params, charset)` - 简化方法 + +**DingDingMessageUtil** - 钉钉通知 +- `sendTextMessage(msg)` - 发送文本消息(使用默认token) +- `sendTextMessage(token, msg)` - 发送文本消息(指定token) + +需要详细用法时直接查看工具类源码 + +## 代码组织 + +### 包结构约定 +``` +com.fangjia.dal.* - 数据访问层 +com.fangjia.service.* - 业务服务层 +com.fangjia.*.controllers - Web控制器(Sothis框架) +com.fangjia.script.* - Groovy脚本 +``` + +### 模块依赖关系 + +**fangjia核心系统**: +``` +fangjia-coresite (WAR) + └── fangjia-service + └── fangjia-dal + └── fangjia-core +``` + +**fangjiaopen系统**: +``` +fangjia-open (WAR) + ├── fangjia-service → fangjia-dal → fangjia-core + └── fangjia-loan-service → fangjia-loan-dal +``` + +**fangjiastatic系统**: +``` +fangjia-static (WAR) + └── fangjia-core +``` + +**script工具集**: +``` +fangjia-script (JAR) + └── fangjia-core +``` + +## 文档转换工具 + +系统已安装 **pandoc**,可直接用于文档格式转换: + +```bash +# Word转Markdown +pandoc input.docx -o output.md + +# Markdown转Word +pandoc input.md -o output.docx + +# 指定格式转换 +pandoc -f <源格式> -t <目标格式> input -o output + +# 常用格式: docx, md, html, pdf, rst等 +``` + +## 开发注意事项 + +### 1. 编码问题 +不同模块使用不同编码(UTF-8/GBK),修改代码前先确认pom.xml中的``设置。 + +### 2. Java版本 +- fangjia-script: Java 1.8 +- 其他模块: Java 1.6 +避免在1.6模块中使用Java 7+特性。 + +### 3. 构建位置 +始终在`deliverables/`目录下构建,而不是`projects/`目录。 + +### 4. Groovy脚本开发 +- 脚本源码位置: `projects/fangjia-script/src/main/groovy/com/fangjia/script/` +- 临时脚本建议放在: `temp/` 目录 +- 脚本会被打包到jar中,依赖会被复制到`target/classes/lib/` + +### 5. Web服务开发(fangjia-open) +- 支持RESTful API和SOAP Web Service(CXF 2.2.3) +- 使用Redis做缓存(Jedis 2.9.0) +- 支持HTML转PDF功能(xhtmlrenderer) +- 支持图表生成(JFreeChart) + +### 6. 共享代码 +需要在多个模块间共享的代码应放入fangjia-core,然后在pom.xml中添加依赖。 + +## 常见任务 + +### 如何添加新的Groovy脚本? +1. 在`projects/fangjia-script/src/main/groovy/com/fangjia/script/`下创建脚本 +2. 确定脚本分类,放入对应目录(如dataImport, crawl, tool等) +3. 在`deliverables/script`目录构建: `mvn package` +4. 运行脚本 + +### 如何修改开放API? +1. 找到对应的Controller: `projects/fangjia-open/src/main/java/` +2. 修改业务逻辑: `projects/fangjia-service/` 或 `projects/fangjia-loan-service/` +3. 修改数据层: `projects/fangjia-dal/` 或 `projects/fangjia-loan-dal/` +4. 在`deliverables/fangjiaopen`构建测试 + +### 如何运行测试? +```bash +cd deliverables/ +mvn test + +# 运行单个测试类 +mvn test -Dtest=YourTestClass + +# 跳过测试 +mvn package -Dmaven.test.skip=true +``` + +### 如何查看构建产物? +WAR文件位置: `deliverables//target/.war` +JAR文件位置: `deliverables/script/target/fangjia-script.jar` + +## Maven仓库配置 + +项目使用多个Maven仓库(deliverables/settings.xml): + +### 依赖仓库 +- **阿里云中央仓库**: https://maven.aliyun.com/repository/central (首选,加速国内下载) +- **Maven中央仓库**: https://repo1.maven.org/maven2 +- **内部Nexus仓库**: https://repo.fangjia.com/repository/ + - maven-public: 发布版本 (releases) + - maven-snapshots: 快照版本 (snapshots) + - maven-releases: 发布版本 (releases) + +### 插件仓库 +- **内部Nexus**: https://repo.fangjia.com/repository/maven-public/ +- **Maven中央仓库**: https://repo.maven.apache.org/maven2 + +### 认证信息 +内部仓库需要使用 deployment 账户进行认证(已在settings.xml中配置) diff --git a/deliverables/fangjiastatic/pom.xml b/deliverables/fangjiastatic/pom.xml index 0f3faa2c1..fa88bd55b 100644 --- a/deliverables/fangjiastatic/pom.xml +++ b/deliverables/fangjiastatic/pom.xml @@ -7,7 +7,7 @@ 0.0.1-SNAPSHOT fangjia-static - GBK + UTF-8 fangjia-static diff --git a/deliverables/settings.xml b/deliverables/settings.xml index ec3f6ff2f..212a3659c 100644 --- a/deliverables/settings.xml +++ b/deliverables/settings.xml @@ -7,10 +7,24 @@ nexus + + aliyun_central + https://maven.aliyun.com/repository/central + + true + + + true + + + + central + https://repo1.maven.org/maven2 + public fangjia-nexus - http://repo.corp.goojia.com/content/groups/public + https://repo.fangjia.com/repository/maven-public/ true @@ -21,56 +35,97 @@ public-snapshots fangjia-snapshots - http://repo.corp.goojia.com/content/groups/public-snapshots + https://repo.fangjia.com/repository/maven-snapshots/ + always false + always true + + public-releases + fangjia-releases + https://repo.fangjia.com/repository/maven-releases/ + + always + false + + + always + true + + + public fangjia-nexus - http://repo.corp.goojia.com/content/groups/public + https://repo.fangjia.com/repository/maven-public/ true + always false + always public-snapshots fangjia-snapshots - http://repo.corp.goojia.com/content/groups/public-snapshots + https://repo.fangjia.com/repository/maven-snapshots/ false + always true + always + + public-releases + fangjia-releases + https://repo.fangjia.com/repository/maven-releases/ + + false + always + + + true + always + + + + central + https://repo.maven.apache.org/maven2 + + - - - - public - deployment - fangjia123456 - - - - public-snapshots - deployment - fangjia123456 - - nexus + + + public-releases + deployment + goojia123456 + + + public + deployment + goojia123456 + + + public-snapshots + deployment + goojia123456 + + diff --git a/projects/fangjia-core/src/main/java/com/fangjia/core/Constants.java b/projects/fangjia-core/src/main/java/com/fangjia/core/Constants.java index 2cc2c080c..657ae56b7 100644 --- a/projects/fangjia-core/src/main/java/com/fangjia/core/Constants.java +++ b/projects/fangjia-core/src/main/java/com/fangjia/core/Constants.java @@ -2,12 +2,18 @@ package com.fangjia.core; public interface Constants { + /** 数据库主库*/ String FANGJIA_MONGO_URI = "mongodb://developer:G00IDCDEV12385@mongo.db.fangjia.com:28017"; String TEST_FANGJIA_MONGO_URI = "mongodb://developer:G00IDCDEV12385@192.168.0.136:28017"; String FANGJIA_CRAWL_MONGO_URI = "mongodb://192.168.0.235:27018"; + /** 日志数据库*/ String LOG_MONGO_URI = "mongodb://192.168.0.42:52002"; String SEABIRD_MONGO_URI = "mongodb://192.168.0.74:57007"; + /** 线下归档数据库*/ String SEAWATER_MONGO_URI = "mongodb://root:Goojia%40206!!#@192.168.0.206:27020"; String MSVC_FANG_JIA_DATA_SERVICE_BASE_PATH ="http://192.168.0.100:38080/FangJiaDataService"; + /** OpenApi测试账户生成的超级Token*/ + String SUPER_USER_TOKEN = "F54F52381C49BB9EB4A33EB1B65604AE4B71A28AEE53518A94A2F360408B9056D57553931D15CE6DDE765562DAD286BA38E05A4CDAFC51C3D527A4959BF8E75A3B95DB7108FCEA340DDE61925616DB55118E1851E67D83EAD800460D100D6B667A4ED8EE67C8F7FB"; + } diff --git a/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/EfundController.java b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/EfundController.java new file mode 100644 index 000000000..e14df307a --- /dev/null +++ b/projects/fangjia-open/src/main/java/com/fangjia/open/controllers/EfundController.java @@ -0,0 +1,54 @@ +package com.fangjia.open.controllers; + +import com.fangjia.open.interceptors.Authority; +import com.fangjia.open.interceptors.Role; +import com.fangjia.open.model.BasicModel; +import com.fangjia.open.model.RestfulModelAndView; +import com.fangjia.service.dto.UniversalDto; +import com.fangjia.service.efund.EfundMatchService; +import org.apache.commons.lang.StringUtils; +import org.sothis.web.mvc.annotation.Param; + +/** + * E基金地址匹配接口Controller + * @author wenyan + */ +@Authority(role = Role.USER) +public class EfundController { + + private EfundMatchService efundMatchService; + + /** + * E基金地址匹配接口 + * 根据地址进行匹配,返回房价信息和地址类型标签 + * + * @param address 地址字符串 + * @param city 城市名称(可选) + * @return 匹配结果JSON + */ + public RestfulModelAndView matchAction(@Param(name = "address") String address, @Param(name = "city") String city) { + RestfulModelAndView mav = new RestfulModelAndView(); + + // 参数校验 + if (StringUtils.isBlank(address)) { + mav.setModel(BasicModel.buildBadRequestModel("address参数不能为空")); + return mav; + } + + // 调用Service进行地址匹配 + UniversalDto result = efundMatchService.matchAddress(address, city); + + if (result == null || result.isEmpty()) { + mav.setModel(BasicModel.buildBadRequestModel("地址匹配失败")); + return mav; + } + + // 返回成功结果 + mav.setModel(BasicModel.buildOKModel().setResult(result)); + return mav; + } + + public void setEfundMatchService(EfundMatchService efundMatchService) { + this.efundMatchService = efundMatchService; + } +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/opentest/EfundInterfaceTest.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/opentest/EfundInterfaceTest.groovy new file mode 100644 index 000000000..538b1cd1e --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/opentest/EfundInterfaceTest.groovy @@ -0,0 +1,222 @@ +package com.fangjia.script.opentest + +import com.fangjia.core.Constants +import com.fangjia.core.util.HttpRequest +import com.fangjia.script.util.ExcelUtils +import net.sf.json.JSONObject + +/** + * E基金地址匹配接口 - 接口测试脚本 + * 功能:使用ExcelUtils.multiThreadingModify多线程调用接口,记录结果、耗时和异常信息 + * @author wenyan + */ + +println "========== E基金接口测试 ==========" +println "开始时间:${new Date()}" + +try { + // 1. 定义数据目录和文件路径 + String scriptDir = new File(getClass().protectionDomain.codeSource.location.path).parent + String dataDir = new File(scriptDir, "data").absolutePath + String inputFile = "${dataDir}${File.separator}efund_test_data.xlsx" + String outputFile = "${dataDir}${File.separator}efund_test_result.xlsx" + + println "测试数据文件:${inputFile}" + println "结果输出文件:${outputFile}" + + // 检查测试数据文件是否存在 + if (!new File(inputFile).exists()) { + println "\n错误:测试数据文件不存在!" + println "请先运行 EfundTestDataExtractor.groovy 提取测试数据" + return + } + + // 2. 读取测试数据并准备结果Excel + println "\n正在准备测试数据..." + List> allData = ExcelUtils.read(inputFile, 0, 0) // 读取所有数据(包括表头) + + if (allData.size() <= 1) { + println "警告:测试数据为空!" + return + } + + println "共 ${allData.size() - 1} 条测试数据" + + // 3. 修改表头,添加结果列 + allData[0] = ["序号", "城市", "地址", "返回城市", "返回区域", "返回街道","返回道路","返回门牌号", + "小区名称", "物业类型", "匹配级别", "匹配置信度", + "参考价格", "典型总价", "更新时间", "耗时(ms)", "异常信息"] + + // 4. 为每一行数据添加空的结果列 + for (int i = 1; i < allData.size(); i++) { + List row = allData[i] + // 添加12个结果列(从"返回城市"到"异常信息") + (3..14).each { row << "" } + } + + // 5. 写入初始结果文件 + println "正在创建结果文件..." + ExcelUtils.write(outputFile, allData, "测试结果") + println "结果文件创建成功!" + + // 6. 使用 ExcelUtils.multiThreadingModify 多线程调用接口 + println "\n开始多线程测试接口..." + println "接口地址:http://localhost:9180/efund/match" + println "线程数:CPU核心数 × 4 = ${Runtime.getRuntime().availableProcessors() * 4}" + + ExcelUtils.multiThreadingModify(outputFile, { List row -> + HttpRequest request = new HttpRequest() + long startTime = System.currentTimeMillis() + + try { + // 提取参数(row[0]=序号, row[1]=城市, row[2]=地址) + String city = row[1]?.toString() ?: "" + String address = row[2]?.toString() ?: "" + + // 调用接口 + Map params = ["address": address, "token": Constants.SUPER_USER_TOKEN] + if (city) { + params.put("city", city) + } + + String response = request.get("http://localhost:9180/efund/match", params, "UTF-8") + long duration = System.currentTimeMillis() - startTime + + // 解析响应 + JSONObject json = JSONObject.fromObject(response) + Integer code = json.optInt("code") + JSONObject result = json.optJSONObject("result") + + if (code == 200 && result != null) { + // 填充结果列(直接修改row) + row[3] = result.optString("city", "") + row[4] = result.optString("district", "") + row[5] = result.optString("street", "") + row[6] = result.optString("road", "") + row[7] = result.optString("road_number", "") + row[8] = result.optString("community_name", "") + row[9] = result.optString("property_type", "") + row[10] = result.optString("match_level", "") + row[11] = result.opt("match_confidence") ?: "" + row[12] = result.opt("reference_price") ?: "" + row[13] = result.opt("typical_total_price") ?: "" + row[14] = result.optString("update_time", "") + row[15] = duration + row[16] = "" // 无异常 + } else { + // 接口返回异常 + row[15] = duration + String msg = json.optString("msg", "") + row[16] = "接口返回错误(code=${code}): ${msg}" + } + + } catch (Exception e) { + long duration = System.currentTimeMillis() - startTime + row[15] = duration + row[16] = "异常: ${e.class.simpleName} - ${e.message}" + } + }, 0, "测试结果") + + // 7. 统计结果 + println "\n正在统计测试结果..." + List> finalData = ExcelUtils.read(outputFile, 0, 0) + + int totalCount = finalData.size() - 1 // 减去表头 + int successCount = 0 + int failCount = 0 + long totalTime = 0 + + Map timeDist = [ + "<100ms": 0, + "100-200ms": 0, + "200-500ms": 0, + "500-1000ms": 0, + ">1000ms": 0 + ] + + for (int i = 1; i < finalData.size(); i++) { + List row = finalData[i] + + // 统计成功/失败 + String errorMsg = row[14]?.toString() ?: "" + if (errorMsg == "") { + successCount++ + + // 统计耗时 + if (row[13] instanceof Number) { + int duration = ((Number)row[13]).intValue() + totalTime += duration + + // 耗时分布 + if (duration < 100) timeDist["<100ms"]++ + else if (duration < 200) timeDist["100-200ms"]++ + else if (duration < 500) timeDist["200-500ms"]++ + else if (duration < 1000) timeDist["500-1000ms"]++ + else timeDist[">1000ms"]++ + } + } else { + failCount++ + } + } + + // 8. 保存统计数据到新Sheet + println "\n正在保存统计数据到Excel..." + List> statsData = [] + + // 基本统计 + statsData << ["统计项", "数值"] + statsData << ["测试时间", new Date().format("yyyy-MM-dd HH:mm:ss")] + statsData << ["", ""] + statsData << ["总测试数", totalCount] + statsData << ["成功数", successCount] + statsData << ["失败数", failCount] + statsData << ["成功率", totalCount > 0 ? String.format('%.2f%%', successCount * 100.0 / totalCount) : '0.00%'] + + if (successCount > 0) { + int avgTime = (totalTime / successCount).intValue() + statsData << ["", ""] + statsData << ["平均耗时(ms)", avgTime] + + // 耗时分布 + statsData << ["", ""] + statsData << ["耗时分布", "数量"] + timeDist.each { range, count -> + statsData << [range, count] + } + } + + // 添加统计Sheet + ExcelUtils.write(outputFile, statsData, "统计数据") + + // 9. 控制台输出统计结果 + println "\n========== 测试完成 ==========" + println "总测试数:${totalCount}" + println "成功数:${successCount}" + println "失败数:${failCount}" + println "成功率:${totalCount > 0 ? String.format('%.2f%%', successCount * 100.0 / totalCount) : '0.00%'}" + + if (successCount > 0) { + int avgTime = (totalTime / successCount).intValue() + println "平均耗时:${avgTime} ms" + + println "\n耗时分布:" + timeDist.each { range, count -> + if (count > 0) { + println " ${range}: ${count} 条" + } + } + } + + println "\n结果文件:${outputFile}" + println " - Sheet1: 测试结果(详细数据)" + println " - Sheet2: 统计数据(汇总信息)" + +} catch (Exception e) { + println "\n错误:脚本执行失败!" + println "异常类型:${e.class.name}" + println "异常信息:${e.message}" + e.printStackTrace() +} finally { + println "\n结束时间:${new Date()}" + println "========================================" +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/opentest/EfundTestDataExtractor.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/opentest/EfundTestDataExtractor.groovy new file mode 100644 index 000000000..9215c84e7 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/opentest/EfundTestDataExtractor.groovy @@ -0,0 +1,122 @@ +package com.fangjia.script.opentest + +import com.fangjia.core.Constants +import com.fangjia.core.util.DateUtil +import com.fangjia.core.util.Mongo3Utils +import com.fangjia.script.util.ExcelUtils +import com.mongodb.client.MongoCollection +import com.mongodb.client.MongoCursor +import org.bson.Document + +/** + * E基金地址匹配接口 - 测试数据提取脚本 + * 功能:从MongoDB 206服务器提取历史测试数据并导出到Excel + * @author wenyan + */ + +println "========== E基金接口测试数据提取 ==========" +println "开始时间:${new Date()}" + +try { + // 1. 连接MongoDB 206 (使用 Mongo3Utils 和 Constants.SEAWATER_MONGO_URI) + println "\n正在连接MongoDB 206服务器..." + MongoCollection coll = Mongo3Utils.getDbCollection( + Constants.SEAWATER_MONGO_URI, + "business", + "open_uri_log" + ) + println "MongoDB连接成功!" + + // 2. 查询条件(使用 Document) + println "\n构建查询条件..." + Document query = new Document() + query.put("user_id", "1007569") + query.put("request_uri", "/address/risk") + query.put("c_date", new Document().append('$gt', DateUtil.parseDate("2025-07-01", "yyyy-MM-dd"))) + + // 先查询总数 + long totalCount = coll.countDocuments(query) + println "符合条件的数据总数:${totalCount}" + + if (totalCount == 0) { + println "警告:未找到符合条件的数据!" + return + } + + println "将提取前 1000 条数据" + + // 3. 查询1000条数据(只查询需要的字段) + println "\n开始查询数据..." + Document projection = new Document("parameter_map", 1).append("_id", 0) + MongoCursor cursor = coll.find(query) + .projection(projection) + .limit(1000) + .iterator() + + // 4. 提取parameter_map中的city和address + List> excelData = [] + excelData << ["序号", "城市", "地址"] + + int index = 0 + int validCount = 0 + int errorCount = 0 + + while (cursor.hasNext()) { + try { + Document doc = cursor.next() + index++ + + // 提取parameter_map + Document paramMap = doc.get("parameter_map", Document.class) + + if (paramMap == null) { + println "警告:第 ${index} 条数据没有 parameter_map 字段" + errorCount++ + continue + } + + String city = paramMap.getString("city") ?: "" + String address = paramMap.getString("address") ?: "" + + excelData << [index, city, address] + validCount++ + + if (index % 100 == 0) { + println "已处理 ${index} 条数据..." + } + + } catch (Exception e) { + errorCount++ + println "处理第 ${index} 条数据时出错:${e.message}" + } + } + + cursor.close() + + println "\n数据提取完成!" + println "总处理数:${index}" + println "有效数据:${validCount}" + println "错误数据:${errorCount}" + + // 5. 保存到Excel + println "\n正在保存Excel文件..." + String scriptDir = new File(getClass().protectionDomain.codeSource.location.path).parent + String dataDir = new File(scriptDir, "data").absolutePath + new File(dataDir).mkdirs() // 确保目录存在 + + String outputFile = "${dataDir}${File.separator}efund_test_data.xlsx" + ExcelUtils.write(outputFile, excelData, "测试数据") + + println "Excel文件保存成功!" + println "输出文件:${outputFile}" + println "数据行数:${excelData.size()} 行(含表头)" + +} catch (Exception e) { + println "\n错误:脚本执行失败!" + println "异常类型:${e.class.name}" + println "异常信息:${e.message}" + e.printStackTrace() +} finally { + println "\n结束时间:${new Date()}" + println "==========================================" +} diff --git a/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/convertEncoding.groovy b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/convertEncoding.groovy new file mode 100644 index 000000000..94f4205f4 --- /dev/null +++ b/projects/fangjia-script/src/main/groovy/com/fangjia/script/temp/convertEncoding.groovy @@ -0,0 +1,56 @@ +package com.fangjia.script.temp +import java.nio.file.* +import java.nio.charset.* +import java.nio.file.attribute.* +import java.nio.ByteBuffer + +// ===== 修改为你的目标目录 ===== +def rootDir = Paths.get("C:\\Users\\wenyan\\IdeaProjects\\main") +// ================================= + +def gbkCharset = Charset.forName("GBK") +def utf8Charset = StandardCharsets.UTF_8 + +Files.walk(rootDir) + .filter { Files.isRegularFile(it) } + .filter { + def name = it.toString().toLowerCase() + name.endsWith(".java") || name.endsWith(".groovy") + } + .forEach { path -> + + byte[] bytes = Files.readAllBytes(path) + + if (isGBK(bytes)) { + println "Converting: $path" + + // 用 GBK 解码 + String content = new String(bytes, gbkCharset) + + // 写回 UTF-8(无 BOM) + Files.write(path, content.getBytes(utf8Charset), + StandardOpenOption.TRUNCATE_EXISTING) + + } else { + println "Skip (not GBK): $path" + } + } + +println "Done." + + +// ===== 判断是否为 GBK 编码 ===== +boolean isGBK(byte[] bytes) { + try { + def decoder = Charset.forName("UTF-8") + .newDecoder() + .onMalformedInput(CodingErrorAction.REPORT) + .onUnmappableCharacter(CodingErrorAction.REPORT) + + decoder.decode(ByteBuffer.wrap(bytes)) + return false // 能被 UTF-8 正确解析 → 不是 GBK + } catch (Exception e) { + return true // UTF-8 解析失败 → 很可能是 GBK + } +} + diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyServiceImpl.java index b36218e3f..5676a95e8 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/api/AddressMatchProxyServiceImpl.java @@ -599,7 +599,7 @@ public class AddressMatchProxyServiceImpl extends AbstractHttpApiService impleme params.put("city", city); params.put("address", address); try { - json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/v2/structure", params, "UTF-8"); + json = request.getJsonContent("http://192.168.0.100:32080/FangJiaAddressService/formatNinelevel", params, "UTF-8"); if (json != null && json.containsKey("msgCode") && json.getInt("msgCode") == 200) { if (json.containsKey("result")) { return (JSONObject) json.get("result"); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java index 914c6395d..27089094c 100644 --- a/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/district/DistrictStatServiceImpl.java @@ -1096,7 +1096,7 @@ public class DistrictStatServiceImpl implements DistrictStatService { if (StringUtils.isNotBlank(city) && StringUtils.isNotBlank(region) && StringUtils.isNotBlank(name)) { DistrictStatBo districtStatBo = this.districtStatService.findDistrictStat(new DistrictKey(city, region, name)); if (districtStatBo.getDefaultDistrictStat() != null) { - return districtStatBo.getDefaultDistrictStat().getAvgPrice(); + return districtStatBo.getDefaultDistrictStat().getAvg_price_2b() != null ? districtStatBo.getDefaultDistrictStat().getAvg_price_2b() : districtStatBo.getDefaultDistrictStat().getAvgPrice(); } return 0; } @@ -1861,7 +1861,9 @@ public class DistrictStatServiceImpl implements DistrictStatService { if (null != weekend) { params.add(new QueryParam("weekend", DateUtil.getThisSunday(weekend))); } - DistrictStat dss = districtStatDao.findFirstByParams(params); + List sortParams = new ArrayList(); + sortParams.add(new SortParam("weekend", false)); + DistrictStat dss = districtStatDao.findFirstByParams(params, sortParams); return dss; } }); diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/efund/EfundMatchService.java b/projects/fangjia-service/src/main/java/com/fangjia/service/efund/EfundMatchService.java new file mode 100644 index 000000000..2832c47d5 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/efund/EfundMatchService.java @@ -0,0 +1,19 @@ +package com.fangjia.service.efund; + +import com.fangjia.service.dto.UniversalDto; + +/** + * E基金地址匹配服务 + * @author wenyan + */ +public interface EfundMatchService { + + /** + * 根据地址进行匹配,返回房价信息和地址类型标签 + * + * @param address 地址字符串 + * @param city 城市名称(可选) + * @return 匹配结果,包含小区信息、房价、地址类型等 + */ + UniversalDto matchAddress(String address, String city); +} diff --git a/projects/fangjia-service/src/main/java/com/fangjia/service/efund/EfundMatchServiceImpl.java b/projects/fangjia-service/src/main/java/com/fangjia/service/efund/EfundMatchServiceImpl.java new file mode 100644 index 000000000..62a489d63 --- /dev/null +++ b/projects/fangjia-service/src/main/java/com/fangjia/service/efund/EfundMatchServiceImpl.java @@ -0,0 +1,308 @@ +package com.fangjia.service.efund; + +import com.fangjia.core.ProvinceData; +import com.fangjia.core.RegionData; +import com.fangjia.core.util.DateUtil; +import com.fangjia.core.util.HttpRequest; +import com.fangjia.core.util.HttpRequestException; +import com.fangjia.dal.common.DistrictKey; +import com.fangjia.dal.mongo.model.DistrictStat; +import com.fangjia.dal.mongo.model.RegionSellStat; +import com.fangjia.dal.mongo.model.bkoff.DealPrice; +import com.fangjia.dal.seaweed.model.District; +import com.fangjia.service.api.AddressMatchProxyService; +import com.fangjia.service.datastore.DistrictService; +import com.fangjia.service.district.DistrictStatService; +import com.fangjia.service.dto.UniversalDto; +import com.fangjia.service.mongo.fangjia.DealPriceService; +import com.fangjia.service.mongo.fangjia.RegionSellStatService; +import net.sf.json.JSONObject; +import org.apache.commons.lang.StringUtils; + +import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * E基金地址匹配服务实现 + * @author wenyan + */ +public class EfundMatchServiceImpl implements EfundMatchService { + + private AddressMatchProxyService addressMatchProxyService; + private DistrictStatService districtStatService; + private DealPriceService dealPriceService; + private DistrictService districtService; + private RegionSellStatService regionSellStatService; + + @Override + public UniversalDto matchAddress(String address, String city) { + if (StringUtils.isBlank(address)) { + return null; + } + + // 调用地址匹配服务 + JSONObject matchResult = addressMatchProxyService.newMatch(city, address, null, true); + + // 检查是否匹配到POI(有id字段),没有id算匹配失败 + String id = (matchResult != null) ? matchResult.optString("id") : null; + if (StringUtils.isBlank(id)) { + // 匹配失败,调用标准化拆分接口 + return handleAddressStructure(city, address); + } + // 从匹配结果获取展示用的城市、区域、街道 + String matchCity = matchResult.optString("city"); + String matchDistrict = matchResult.optString("district"); + String matchName = matchResult.optString("name"); + String street = matchResult.optString("street"); + String township = matchResult.optString("township"); + String category = matchResult.optString("category"); + if(category.contains("写字楼")){ + category = "写字楼"; + } + Double credit = matchResult.optDouble("credit", 0.0); + UniversalDto result = UniversalDto.newDto(); + // 输出基本信息 + if(StringUtils.isNotBlank(matchCity)){ + result.append("city", matchCity); + } + if(StringUtils.isNotBlank(matchDistrict)){ + result.append("district", matchDistrict); + } + if(StringUtils.isNotBlank(township)){ + result.append("street", township); + } + if(StringUtils.isNotBlank(township)){ + result.append("community_name", matchName); + } + result.append("match_confidence", credit); + result.append("property_type", category); + result.append("validation", "地址有效"); + // 有id,匹配到POI,使用id查询权威的小区信息 + District district = districtService.findById(id); + if (district != null && district.getCategory().equals("district")) { + // 从District获取权威的城市、区域、名称(用于查询价格和成交数据) + String districtCity = district.getCity(); + String districtRegion = district.getRegion(); + String districtName = district.getName(); + // 小区,输出房价 + result.append("property_type", "住宅"); + result.append("match_level", "小区级"); + // 查询小区房价和数据更新时间 + DistrictStat latestStat = districtStatService.findOneDistrictStatsSort(districtCity, districtRegion, districtName, null); + if (latestStat != null) { + // 优先使用avg_price_2b,如果为空再使用avgPrice + Integer avgPrice = null; + if (latestStat.getAvg_price_2b() != null && latestStat.getAvg_price_2b() > 0) { + avgPrice = latestStat.getAvg_price_2b(); + } else if (latestStat.getAvgPrice() > 0) { + avgPrice = latestStat.getAvgPrice(); + } + + if (avgPrice != null && avgPrice > 0) { + result.append("reference_price", avgPrice); + + // 数据更新时间 + if (latestStat.getWeekend() != null) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + result.append("update_time", sdf.format(latestStat.getWeekend())); + } + + // 查询典型总价:成交单价最接近参考均价的成交记录的总价 + DistrictKey districtKey = new DistrictKey(districtCity, districtRegion, districtName); + Integer typicalTotalPrice = findTypicalTotalPrice(districtKey, avgPrice); + if (typicalTotalPrice != null) { + result.append("typical_total_price", typicalTotalPrice); + } + } + } + }else if(district != null && district.getCategory().equals("office")){ + // 写字楼,不输出房价 + result.append("property_type", "写字楼"); + result.append("match_level", "建筑级"); + }else { + result.append("match_level", "建筑级"); + result.append("property_type", category); + if(category.contains("住宅")){ + result.append("match_level", "小区级"); + result.append("property_type", "住宅"); + String location = matchResult.getString("lng") + "," + matchResult.getString("lat"); + HttpRequest httpRequest = new HttpRequest(); + JSONObject json = null; + Map param = new HashMap(); + param.put("location", location); + param.put("area", "100"); + try { + json = httpRequest.getJsonContent("http://192.168.0.100:30020/avmWeb/avmAnn", param, "UTF-8"); + if (json.containsKey("msg") && "成功".equals(json.getString("msg"))) { + result.put("reference_price", json.getInt("unitPrice")); + result.append("update_time", DateUtil.formatByPattern(DateUtil.getFirstDayOfWeek(new Date()), "yyyy-MM-dd")); + } + } catch (HttpRequestException e) { + throw new RuntimeException(e); + } + } + } + return result; + } + + /** + * 查找典型总价:成交单价最接近参考均价的成交记录的总价 + * @param districtKey 小区Key + * @param referencePrice 参考均价 + * @return 典型总价(万元) + */ + private Integer findTypicalTotalPrice(DistrictKey districtKey, Integer referencePrice) { + if (referencePrice == null || referencePrice <= 0) { + return null; + } + + try { + // 计算半年前的日期和当前日期 + Date halfYearAgo = new Date(System.currentTimeMillis() - 180L * 24 * 60 * 60 * 1000); + Date now = new Date(); + + // 查询近半年的成交记录 + List dealPrices = dealPriceService.findDealPriceList( + districtKey.getCity(), + districtKey.getRegion(), + districtKey.getName(), + halfYearAgo, + now + ); + + if (dealPrices == null || dealPrices.isEmpty()) { + return null; + } + + // 找到单价最接近参考均价的成交记录 + DealPrice closestDeal = null; + int minDiff = Integer.MAX_VALUE; + + for (DealPrice deal : dealPrices) { + if (deal.getAvgPrice() != null && deal.getTotalPrice() != null) { + int diff = Math.abs(deal.getAvgPrice() - referencePrice); + if (diff < minDiff) { + minDiff = diff; + closestDeal = deal; + } + } + } + + if (closestDeal != null && closestDeal.getTotalPrice() != null) { + // 检查价格差异是否超过10% + double diffPercent = Math.abs(closestDeal.getAvgPrice() - referencePrice) * 1.0 / referencePrice; + if (diffPercent > 0.1) { + return null; + } + return closestDeal.getTotalPrice()/10000; + } + + } catch (Exception e) { + // 查询失败时不影响主流程,仅记录日志 + } + + return null; + } + + /** + * 处理地址标准化拆分并返回区域价格 + * @param city 城市 + * @param address 地址 + * @return 包含区域价格的结果 + */ + private UniversalDto handleAddressStructure(String city, String address) { + try { + // 调用地址标准化拆分 + JSONObject structureResult = addressMatchProxyService.addressStructure(city, address); + if (structureResult == null || structureResult.isEmpty()) { + return null; + } + + UniversalDto result = UniversalDto.newDto(); + + // 提取拆分的城市、区域、街道信息 + String province = structureResult.optString("province", null); + String cityField = structureResult.optString("city", null); + String structDistrict = structureResult.optString("district", null); + String structTownship = structureResult.optString("township", null); + String structRoad = structureResult.optString("street", null); + String structRoadNumber = structureResult.optString("streetNumber", null); + String msg = null; + if(structureResult.containsKey("addressAssessment")){ + JSONObject addressAssessment = structureResult.getJSONObject("addressAssessment"); + msg = addressAssessment.optString("msg"); + } + // 处理直辖市:如果是直辖市,城市名在province字段中 + String structCity; + if (ProvinceData.isGovernmentCity(province)) { + structCity = province; + } else { + structCity = cityField; + } + // 输出基本信息 + result.append("city", structCity); + result.append("district", structDistrict); + result.append("street", structTownship); + result.append("road", structRoad); + result.append("road_number", structRoadNumber); + result.append("validation", msg); + if(StringUtils.isNotBlank(structRoadNumber)){ + result.append("match_level", "门牌级"); + }else if(StringUtils.isNotBlank(structRoad)){ + result.append("match_level", "道路级"); + }else if(StringUtils.isNotBlank(structTownship)){ + result.append("match_level", "街道级"); + }else if(StringUtils.isNotBlank(structDistrict)){ + result.append("match_level", "区域级"); + }else if(StringUtils.isNotBlank(structCity)){ + result.append("match_level", "城市级"); + } + // 格式化城市和区域为简称 + String formattedCity = RegionData.formatCity(structCity); + String formattedRegion = RegionData.formatRegion(formattedCity, structDistrict); + + // 查询区域价格 + if (StringUtils.isNotBlank(formattedCity) && StringUtils.isNotBlank(formattedRegion)) { + RegionSellStat regionSellStat = regionSellStatService.findNewestRegionPrice(formattedCity, formattedRegion); + if (regionSellStat != null && regionSellStat.getAvgPrice() != null && regionSellStat.getAvgPrice() > 0) { + result.append("reference_price", regionSellStat.getAvgPrice()); + + // 数据更新时间 + if (regionSellStat.getUpdateDate() != null) { + result.append("update_time", DateUtil.formatByPattern(DateUtil.parseDate(regionSellStat.getDate().toString(),"yyyyMM"), "yyyy-MM-dd")); + } + } + } + + return result; + + } catch (Exception e) { + // 处理失败时返回null + return null; + } + } + + public void setAddressMatchProxyService(AddressMatchProxyService addressMatchProxyService) { + this.addressMatchProxyService = addressMatchProxyService; + } + + public void setDistrictStatService(DistrictStatService districtStatService) { + this.districtStatService = districtStatService; + } + + public void setDealPriceService(DealPriceService dealPriceService) { + this.dealPriceService = dealPriceService; + } + + public void setDistrictService(DistrictService districtService) { + this.districtService = districtService; + } + + public void setRegionSellStatService(RegionSellStatService regionSellStatService) { + this.regionSellStatService = regionSellStatService; + } +} diff --git a/projects/fangjia-static/pom.xml b/projects/fangjia-static/pom.xml index 7be7f7dae..f2beef88f 100644 --- a/projects/fangjia-static/pom.xml +++ b/projects/fangjia-static/pom.xml @@ -8,7 +8,7 @@ fangjia-static http://maven.apache.org - GBK + UTF-8 fangjia-static @@ -20,7 +20,7 @@ 1.6 1.6 - GBK + UTF-8