更新外观模块

This commit is contained in:
super
2026-05-06 22:41:26 +08:00
parent 5fe1242cb1
commit dd7d657018
24 changed files with 1378 additions and 175 deletions
@@ -2,10 +2,13 @@ package com.nanri.aiimage.modules.similarasin.controller;
import com.nanri.aiimage.common.api.ApiResponse;
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinFilterConditionAddRequest;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinParseRequest;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinParsedPayloadDto;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinSubmitResultRequest;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinTaskBatchRequest;
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinDashboardVo;
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinFilterConditionVo;
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinHistoryVo;
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinParseVo;
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinTaskBatchVo;
@@ -29,6 +32,7 @@ import org.springframework.web.server.ResponseStatusException;
import java.io.InputStream;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.List;
@RestController
@RequiredArgsConstructor
@@ -38,12 +42,48 @@ public class SimilarAsinController {
private final SimilarAsinTaskService service;
@GetMapping("/filter-conditions")
@Operation(summary = "查询货源查询筛选条件")
public ApiResponse<List<SimilarAsinFilterConditionVo>> listFilterConditions(
@Parameter(description = "当前用户 ID", required = true, example = "1")
@RequestParam("user_id") Long userId) {
return ApiResponse.success(service.listFilterConditions(userId));
}
@PostMapping("/filter-conditions")
@Operation(summary = "保存货源查询筛选条件")
public ApiResponse<SimilarAsinFilterConditionVo> addFilterCondition(
@Valid @RequestBody SimilarAsinFilterConditionAddRequest request) {
return ApiResponse.success(service.addFilterCondition(request));
}
@DeleteMapping("/filter-conditions/{id}")
@Operation(summary = "删除货源查询筛选条件")
public ApiResponse<Void> deleteFilterCondition(
@Parameter(description = "筛选条件主键", example = "10")
@PathVariable Long id,
@Parameter(description = "当前用户 ID", required = true, example = "1")
@RequestParam("user_id") Long userId) {
service.deleteFilterCondition(userId, id);
return ApiResponse.success(null);
}
@PostMapping("/parse")
@Operation(summary = "解析 Excel 并创建任务", description = "解析上传后的 Excel 文件,提取 id、ASIN、国家、URL、标题等字段。返回给前端的数据只包含整数 id 和 n_1 行;n_2、n_3 等子行会保存在 OSS 解析载荷中,用于最终结果补齐。创建后的任务状态为 PENDING,不会自动推送 Python。")
public ApiResponse<SimilarAsinParseVo> parse(@Valid @RequestBody SimilarAsinParseRequest request) {
return ApiResponse.success(service.parseAndCreateTask(request));
}
@GetMapping("/tasks/{taskId}/parsed-payload")
@Operation(summary = "获取货源查询完整解析载荷", description = "给 Python 队列消费端使用。parse 接口只返回轻量预览,大文件完整行数据通过该接口按 taskId 拉取。")
public ApiResponse<SimilarAsinParsedPayloadDto> parsedPayload(
@Parameter(description = "货源查询任务 ID", required = true, example = "7004")
@PathVariable Long taskId,
@Parameter(description = "当前用户 ID", required = true, example = "1")
@RequestParam("user_id") Long userId) {
return ApiResponse.success(service.parsedPayload(taskId, userId));
}
@GetMapping("/dashboard")
@Operation(summary = "查询相似ASIN检测总览", description = "查询当前用户的运行中、成功、失败和已结束任务数量。页面进入时请求一次即可,不需要持续轮询。")
public ApiResponse<SimilarAsinDashboardVo> dashboard(
@@ -0,0 +1,9 @@
package com.nanri.aiimage.modules.similarasin.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.nanri.aiimage.modules.similarasin.model.entity.SimilarAsinFilterConditionEntity;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SimilarAsinFilterConditionMapper extends BaseMapper<SimilarAsinFilterConditionEntity> {
}
@@ -0,0 +1,24 @@
package com.nanri.aiimage.modules.similarasin.model.dto;
import com.fasterxml.jackson.annotation.JsonAlias;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Data
@Schema(description = "货源查询筛选条件新增请求")
public class SimilarAsinFilterConditionAddRequest {
@NotNull
@JsonProperty("user_id")
@Schema(description = "当前用户 ID", example = "1", requiredMode = Schema.RequiredMode.REQUIRED)
private Long userId;
@NotBlank
@JsonProperty("condition_text")
@JsonAlias({"conditionText", "filter_condition", "filterCondition"})
@Schema(description = "筛选条件文本", example = "只筛选有货且不带品牌 logo 的商品", requiredMode = Schema.RequiredMode.REQUIRED)
private String conditionText;
}
@@ -0,0 +1,19 @@
package com.nanri.aiimage.modules.similarasin.model.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.time.LocalDateTime;
@Data
@TableName("biz_similar_asin_filter_condition")
public class SimilarAsinFilterConditionEntity {
@TableId(type = IdType.AUTO)
private Long id;
private Long userId;
private String conditionText;
private LocalDateTime createdAt;
}
@@ -0,0 +1,17 @@
package com.nanri.aiimage.modules.similarasin.model.vo;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class SimilarAsinFilterConditionVo {
private Long id;
@JsonProperty("conditionText")
private String conditionText;
private LocalDateTime createdAt;
}
@@ -11,14 +11,18 @@ import com.nanri.aiimage.common.service.DistributedJobLockService;
import com.nanri.aiimage.config.InstanceMetadata;
import com.nanri.aiimage.config.SimilarAsinProperties;
import com.nanri.aiimage.config.StorageProperties;
import com.nanri.aiimage.modules.similarasin.mapper.SimilarAsinFilterConditionMapper;
import com.nanri.aiimage.modules.similarasin.client.SimilarAsinCozeClient;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinFilterConditionAddRequest;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinParseRequest;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinParsedPayloadDto;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinResultGroupDto;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinResultRowDto;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinSourceFileDto;
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinSubmitResultRequest;
import com.nanri.aiimage.modules.similarasin.model.entity.SimilarAsinFilterConditionEntity;
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinDashboardVo;
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinFilterConditionVo;
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinHistoryItemVo;
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinHistoryVo;
import com.nanri.aiimage.modules.similarasin.model.vo.SimilarAsinParsedGroupVo;
@@ -102,6 +106,7 @@ public class SimilarAsinTaskService {
private static final long RESULT_ROWS_READ_RETRY_DELAY_MS = 500L;
private static final Duration TASK_LOCK_TTL = Duration.ofMinutes(5);
private static final long TASK_LOCK_WAIT_MILLIS = 10000L;
private static final int PARSE_RESPONSE_PREVIEW_LIMIT = 100;
private static final List<String> RESULT_HEADERS = List.of(
"id",
"asin",
@@ -118,6 +123,7 @@ public class SimilarAsinTaskService {
private final FileResultMapper fileResultMapper;
private final TaskScopeStateMapper taskScopeStateMapper;
private final TaskChunkMapper taskChunkMapper;
private final SimilarAsinFilterConditionMapper filterConditionMapper;
private final ObjectMapper objectMapper;
private final SimilarAsinCozeClient cozeClient;
private final SimilarAsinTaskCacheService taskCacheService;
@@ -133,6 +139,55 @@ public class SimilarAsinTaskService {
@Qualifier("cozeTaskExecutor")
private TaskExecutor cozeTaskExecutor;
public List<SimilarAsinFilterConditionVo> listFilterConditions(Long userId) {
validateUserId(userId);
List<SimilarAsinFilterConditionEntity> rows = filterConditionMapper.selectList(
new LambdaQueryWrapper<SimilarAsinFilterConditionEntity>()
.eq(SimilarAsinFilterConditionEntity::getUserId, userId)
.orderByDesc(SimilarAsinFilterConditionEntity::getId));
List<SimilarAsinFilterConditionVo> list = new ArrayList<>();
for (SimilarAsinFilterConditionEntity row : rows) {
list.add(toFilterConditionVo(row));
}
return list;
}
@Transactional
public SimilarAsinFilterConditionVo addFilterCondition(SimilarAsinFilterConditionAddRequest request) {
validateUserId(request.getUserId());
String text = normalize(request.getConditionText());
if (text.isBlank()) {
throw new BusinessException("筛选条件不能为空");
}
SimilarAsinFilterConditionEntity existing = filterConditionMapper.selectOne(
new LambdaQueryWrapper<SimilarAsinFilterConditionEntity>()
.eq(SimilarAsinFilterConditionEntity::getUserId, request.getUserId())
.eq(SimilarAsinFilterConditionEntity::getConditionText, text)
.last("limit 1"));
if (existing != null) {
return toFilterConditionVo(existing);
}
SimilarAsinFilterConditionEntity entity = new SimilarAsinFilterConditionEntity();
entity.setUserId(request.getUserId());
entity.setConditionText(text);
entity.setCreatedAt(LocalDateTime.now());
filterConditionMapper.insert(entity);
return toFilterConditionVo(entity);
}
@Transactional
public void deleteFilterCondition(Long userId, Long id) {
validateUserId(userId);
if (id == null || id <= 0) {
throw new BusinessException("id 不合法");
}
SimilarAsinFilterConditionEntity row = filterConditionMapper.selectById(id);
if (row == null || !userId.equals(row.getUserId())) {
throw new BusinessException("记录不存在");
}
filterConditionMapper.deleteById(id);
}
public SimilarAsinParseVo parseAndCreateTask(SimilarAsinParseRequest request) {
long startedAt = System.nanoTime();
if (request.getUserId() == null || request.getUserId() <= 0) {
@@ -240,8 +295,8 @@ public class SimilarAsinTaskService {
vo.setDroppedRows(droppedRows);
vo.setGroupCount(groups.size());
vo.setAiPrompt(normalize(request.getAiPrompt()));
vo.setItems(allRows);
vo.setGroups(groups);
vo.setItems(buildResponsePreviewRows(allRows));
vo.setGroups(List.of());
long finishedAt = System.nanoTime();
log.info("[similar-asin] parse timing taskId={} files={} rows={} groups={} totalMs={} parseMs={} groupMs={} taskInsertMs={} payloadJsonMs={} payloadStoreMs={} persistMs={} responseMs={}",
task.getId(),
@@ -922,6 +977,36 @@ public class SimilarAsinTaskService {
return groups;
}
private List<SimilarAsinParsedRowVo> buildResponsePreviewRows(List<SimilarAsinParsedRowVo> rows) {
if (rows == null || rows.isEmpty()) {
return List.of();
}
int limit = Math.min(PARSE_RESPONSE_PREVIEW_LIMIT, rows.size());
List<SimilarAsinParsedRowVo> preview = new ArrayList<>(limit);
for (int i = 0; i < limit; i++) {
preview.add(copyPreviewRow(rows.get(i)));
}
return preview;
}
private SimilarAsinParsedRowVo copyPreviewRow(SimilarAsinParsedRowVo row) {
SimilarAsinParsedRowVo vo = new SimilarAsinParsedRowVo();
vo.setSourceFileKey(row.getSourceFileKey());
vo.setSourceFilename(row.getSourceFilename());
vo.setRowIndex(row.getRowIndex());
vo.setSourceId(row.getSourceId());
vo.setDisplayId(row.getDisplayId());
vo.setRowToken(row.getRowToken());
vo.setGroupKey(row.getGroupKey());
vo.setAsin(row.getAsin());
vo.setCountry(row.getCountry());
vo.setPrice(row.getPrice());
vo.setUrl(row.getUrl());
vo.setTitle(row.getTitle());
vo.setValues(new LinkedHashMap<>());
return vo;
}
private Map<String, List<SimilarAsinParsedRowVo>> groupRowsByBaseId(List<SimilarAsinParsedRowVo> rows) {
Map<String, List<SimilarAsinParsedRowVo>> result = new LinkedHashMap<>();
if (rows == null) {
@@ -2228,6 +2313,28 @@ public class SimilarAsinTaskService {
return preferred == null || preferred.isBlank() ? fallback : preferred.trim();
}
private void validateUserId(Long userId) {
if (userId == null || userId <= 0) {
throw new BusinessException("user_id 不合法");
}
}
private SimilarAsinFilterConditionVo toFilterConditionVo(SimilarAsinFilterConditionEntity row) {
SimilarAsinFilterConditionVo vo = new SimilarAsinFilterConditionVo();
vo.setId(row.getId());
vo.setConditionText(row.getConditionText());
vo.setCreatedAt(row.getCreatedAt());
return vo;
}
public SimilarAsinParsedPayloadDto parsedPayload(Long taskId, Long userId) {
FileTaskEntity task = fileTaskMapper.selectById(taskId);
if (task == null || !MODULE_TYPE.equals(task.getModuleType()) || userId != null && !Objects.equals(userId, task.getUserId())) {
throw new BusinessException("任务不存在");
}
return readParsedPayload(task);
}
private String normalize(String val) {
return val == null ? "" : val.replace(String.valueOf((char) 0xFEFF), "").replace((char) 0x3000, ' ').trim().replaceAll("\\s+", " ");
}