From 35bed42b734a2cd3bcac0fbe3fcbbf3b1641fec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sun, 6 Sep 2026 22:47:53 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=AD=9B=E9=80=89=E5=A5=91=E7=BA=A6):=20?= =?UTF-8?q?=E5=8E=BB=E9=87=8D=E6=B1=87=E6=80=BB/=E5=93=81=E7=89=8C?= =?UTF-8?q?=E5=BA=93/=E6=9F=A5=E8=AF=A2ASIN=20=E5=88=97=E8=A1=A8=E4=B8=8E?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3=20@RequestParam=20?= =?UTF-8?q?=E6=98=BE=E5=BC=8F=20snake=5Fcase(page=5Fsize/group=5Fid/data?= =?UTF-8?q?=5Fvalue/shop=5Fname/start=5Fdate/end=5Fdate)=EF=BC=8C=E4=B8=8E?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=20asin-filter=20=E5=BA=8F=E5=88=97=E5=8C=96?= =?UTF-8?q?=E5=AF=B9=E9=BD=90=E2=80=94=E2=80=94=E4=BF=AE=E5=A4=8D=E5=85=A8?= =?UTF-8?q?=E7=AB=99=E7=AD=9B=E9=80=89/=E5=88=86=E9=A1=B5=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=95=88(=E5=89=8D=E7=AB=AFsnake=20vs=20=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E8=A3=B8camel=E5=85=A8=E4=B8=8D=E5=8C=B9=E9=85=8D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DedupeTotalDataController.java | 26 +++++++++---------- .../controller/InvalidAsinDataController.java | 12 ++++----- .../controller/QueryAsinController.java | 22 ++++++++-------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/controller/DedupeTotalDataController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/controller/DedupeTotalDataController.java index 833480ae..429f72c0 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/controller/DedupeTotalDataController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/dedupe/controller/DedupeTotalDataController.java @@ -78,16 +78,16 @@ public class DedupeTotalDataController { @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "查询成功", content = @Content(schema = @Schema(implementation = DedupeTotalDataPageVo.class))) }) public ApiResponse page( - @Parameter(description = "页码") @RequestParam(defaultValue = "1") Long page, - @Parameter(description = "每页数量") @RequestParam(defaultValue = "15") Long pageSize, - @Parameter(description = "数据值模糊搜索关键字") @RequestParam(required = false) String keyword, - @Parameter(description = "用户名模糊搜索关键字") @RequestParam(required = false) String username, + @Parameter(description = "页码") @RequestParam(name = "page", defaultValue = "1") Long page, + @Parameter(description = "每页数量") @RequestParam(name = "page_size", defaultValue = "15") Long pageSize, + @Parameter(description = "数据值模糊搜索关键字") @RequestParam(name = "keyword", required = false) String keyword, + @Parameter(description = "用户名模糊搜索关键字") @RequestParam(name = "username", required = false) String username, @Parameter(description = "开始日期（包含）") - @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate, + @RequestParam(name = "start_date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate, @Parameter(description = "结束日期（包含）") - @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate, - @Parameter(description = "分组 ID") @RequestParam(required = false) Long groupId, - @Parameter(description = "国家代码（如 DE、UK）") @RequestParam(required = false) String country, + @RequestParam(name = "end_date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate, + @Parameter(description = "分组 ID") @RequestParam(name = "group_id", required = false) Long groupId, + @Parameter(description = "国家代码（如 DE、UK）") @RequestParam(name = "country", required = false) String country, HttpServletRequest request) { RequestOperator operator = requireDedupeTotalDataAccess(request); return ApiResponse.success(dedupeTotalDataService.page( @@ -97,13 +97,13 @@ public class DedupeTotalDataController { @GetMapping("/export") @Operation(summary = "导出总数据", description = "按上传用户名和创建日期导出当前用户可访问的总数据；跨自然月时按月生成 XLSX 并打包为 ZIP。") public ResponseEntity export( - @Parameter(description = "用户名模糊搜索关键字") @RequestParam(required = false) String username, + @Parameter(description = "用户名模糊搜索关键字") @RequestParam(name = "username", required = false) String username, @Parameter(description = "开始日期（包含）") - @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate, + @RequestParam(name = "start_date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startDate, @Parameter(description = "结束日期（包含）") - @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate, - @Parameter(description = "分组 ID") @RequestParam(required = false) Long groupId, - @Parameter(description = "国家代码（如 DE、UK）") @RequestParam(required = false) String country, + @RequestParam(name = "end_date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endDate, + @Parameter(description = "分组 ID") @RequestParam(name = "group_id", required = false) Long groupId, + @Parameter(description = "国家代码（如 DE、UK）") @RequestParam(name = "country", required = false) String country, HttpServletRequest request) { if (startDate != null && endDate != null && startDate.isAfter(endDate)) { throw new BusinessException(400, "invalid export date range"); diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/invalidasin/controller/InvalidAsinDataController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/invalidasin/controller/InvalidAsinDataController.java index 65f2c8d5..98e47eb9 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/invalidasin/controller/InvalidAsinDataController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/invalidasin/controller/InvalidAsinDataController.java @@ -60,12 +60,12 @@ public class InvalidAsinDataController { @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "查询成功", content = @Content(schema = @Schema(implementation = InvalidAsinDataPageVo.class))) }) public ApiResponse page( - @Parameter(description = "页码") @RequestParam(defaultValue = "1") Long page, - @Parameter(description = "每页数量") @RequestParam(defaultValue = "15") Long pageSize, - @Parameter(description = "模糊搜索关键字") @RequestParam(required = false) String keyword, - @Parameter(description = "ASIN 模糊搜索") @RequestParam(required = false) String dataValue, - @Parameter(description = "品牌模糊搜索") @RequestParam(required = false) String brand, - @Parameter(description = "分组 ID") @RequestParam(required = false) Long groupId, + @Parameter(description = "页码") @RequestParam(name = "page", defaultValue = "1") Long page, + @Parameter(description = "每页数量") @RequestParam(name = "page_size", defaultValue = "15") Long pageSize, + @Parameter(description = "模糊搜索关键字") @RequestParam(name = "keyword", required = false) String keyword, + @Parameter(description = "ASIN 模糊搜索") @RequestParam(name = "data_value", required = false) String dataValue, + @Parameter(description = "品牌模糊搜索") @RequestParam(name = "brand", required = false) String brand, + @Parameter(description = "分组 ID") @RequestParam(name = "group_id", required = false) Long groupId, HttpServletRequest request) { RequestOperator operator = requireInvalidAsinDataAccess(request); return ApiResponse.success(invalidAsinDataService.page( diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/QueryAsinController.java b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/QueryAsinController.java index 059ee59c..6197e95a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/QueryAsinController.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/shopkey/controller/QueryAsinController.java @@ -54,12 +54,12 @@ public class QueryAsinController { @Operation(summary = "分页查询 ASIN") public ApiResponse page( HttpServletRequest request, - @Parameter(description = "页码") @RequestParam(defaultValue = "1") Long page, - @Parameter(description = "每页数量") @RequestParam(defaultValue = "15") Long pageSize, - @Parameter(description = "分组ID") @RequestParam(required = false) Long groupId, - @Parameter(description = "店铺名") @RequestParam(required = false) String shopName, - @Parameter(description = "商品 ASIN") @RequestParam(required = false) String asin, - @Parameter(description = "国家代码(DE/UK/FR/IT/ES)") @RequestParam(required = false) String country) { + @Parameter(description = "页码") @RequestParam(name = "page", defaultValue = "1") Long page, + @Parameter(description = "每页数量") @RequestParam(name = "page_size", defaultValue = "15") Long pageSize, + @Parameter(description = "分组ID") @RequestParam(name = "group_id", required = false) Long groupId, + @Parameter(description = "店铺名") @RequestParam(name = "shop_name", required = false) String shopName, + @Parameter(description = "商品 ASIN") @RequestParam(name = "asin", required = false) String asin, + @Parameter(description = "国家代码(DE/UK/FR/IT/ES)") @RequestParam(name = "country", required = false) String country) { AdminUserEntity operator = requireOperator(request); return ApiResponse.success(queryAsinService.page( page, @@ -76,10 +76,10 @@ public class QueryAsinController { @Operation(summary = "导出查询 ASIN") public ResponseEntity export( HttpServletRequest request, - @Parameter(description = "分组ID") @RequestParam(required = false) Long groupId, - @Parameter(description = "店铺名") @RequestParam(required = false) String shopName, - @Parameter(description = "商品 ASIN") @RequestParam(required = false) String asin, - @Parameter(description = "国家代码(DE/UK/FR/IT/ES)") @RequestParam(required = false) String country) { + @Parameter(description = "分组ID") @RequestParam(name = "group_id", required = false) Long groupId, + @Parameter(description = "店铺名") @RequestParam(name = "shop_name", required = false) String shopName, + @Parameter(description = "商品 ASIN") @RequestParam(name = "asin", required = false) String asin, + @Parameter(description = "国家代码(DE/UK/FR/IT/ES)") @RequestParam(name = "country", required = false) String country) { AdminUserEntity operator = requireOperator(request); byte[] bytes = queryAsinService.export(groupId, shopName, asin, country, operator.getId(), isSuper(operator)); @@ -106,7 +106,7 @@ public class QueryAsinController { public ApiResponse importExcel( HttpServletRequest request, @Parameter(description = "xlsx/xls 文件", required = true) @RequestParam("file") MultipartFile file, - @Parameter(description = "Excel 未提供分组时使用的分组ID") @RequestParam(required = false) Long groupId) { + @Parameter(description = "Excel 未提供分组时使用的分组ID") @RequestParam(name = "group_id", required = false) Long groupId) { AdminUserEntity operator = requireOperator(request); return ApiResponse.success("开始导入", queryAsinService.startImport(file, groupId, operator.getId(), isSuper(operator)));