Enhance surcharge management by adding support for price type filtering in SurchargeController and related services. Introduce new methods for handling redline product codes in mappers and services. Update front-end API to accommodate price type parameters in surcharge queries. Modify database schema to include redline product and country tables for improved surcharge calculations.

2026-10-09 17:30:29 +08:00
parent 380577f691
commit f1f6ddd368
34 changed files with 5196 additions and 30 deletions
@@ -0,0 +1,97 @@
+package com.bms.price.task;
+
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import com.bms.common.core.redis.RedisCache;
+import com.bms.common.utils.StringUtils;
+import com.bms.price.domain.BmsRedlineProductImportTask;
+import com.bms.price.service.IBmsRedlineProductService;
+
+/**
+ * Async runner for product Excel import (avoids HTTP timeout on large workbooks).
+ */
+@Component
+public class BmsRedlineProductImportAsyncRunner
+{
+    private static final Logger log = LoggerFactory.getLogger(BmsRedlineProductImportAsyncRunner.class);
+
+    public static final String CACHE_KEY_PREFIX = "price:redline:import:task:";
+    public static final int TTL_MINUTES = 60;
+
+    @Autowired
+    private IBmsRedlineProductService productService;
+
+    @Autowired
+    private RedisCache redisCache;
+
+    /** Background all-country (Weishi catalog) import. */
+    @Async("threadPoolTaskExecutor")
+    public void runImportAll(String taskId, byte[] bytes, String filename, boolean updateSupport, String operName,
+        Date effectiveDate)
+    {
+        try
+        {
+            put(taskId, BmsRedlineProductImportTask.STATUS_RUNNING, 5, "parsing excel", null);
+            String message = productService.importProductExcel(bytes, filename, updateSupport, operName, taskId,
+                effectiveDate);
+            put(taskId, BmsRedlineProductImportTask.STATUS_SUCCESS, 100, message, null);
+            log.info("async product import done, taskId={}", taskId);
+        }
+        catch (Exception e)
+        {
+            log.error("async product import failed, taskId={}", taskId, e);
+            put(taskId, BmsRedlineProductImportTask.STATUS_FAIL, 100, "failed", errorMessage(e));
+        }
+    }
+
+    /** Background single-country cost-sheet import. */
+    @Async("threadPoolTaskExecutor")
+    public void runImportCountry(String taskId, byte[] bytes, String filename, String countryCode, String operName,
+        Date effectiveDate)
+    {
+        try
+        {
+            put(taskId, BmsRedlineProductImportTask.STATUS_RUNNING, 5, "parsing excel", null);
+            String message = productService.importCountryProductExcel(bytes, filename, countryCode, operName, taskId,
+                effectiveDate);
+            put(taskId, BmsRedlineProductImportTask.STATUS_SUCCESS, 100, message, null);
+            log.info("async product country import done, taskId={}, country={}", taskId, countryCode);
+        }
+        catch (Exception e)
+        {
+            log.error("async product country import failed, taskId={}, country={}", taskId, countryCode, e);
+            put(taskId, BmsRedlineProductImportTask.STATUS_FAIL, 100, "failed", errorMessage(e));
+        }
+    }
+
+    public void put(String taskId, String status, int percent, String message, String error)
+    {
+        BmsRedlineProductImportTask task = new BmsRedlineProductImportTask();
+        task.setTaskId(taskId);
+        task.setStatus(status);
+        task.setPercent(percent);
+        task.setMessage(message);
+        task.setError(error);
+        redisCache.setCacheObject(CACHE_KEY_PREFIX + taskId, task, TTL_MINUTES, TimeUnit.MINUTES);
+    }
+
+    public BmsRedlineProductImportTask get(String taskId)
+    {
+        return redisCache.getCacheObject(CACHE_KEY_PREFIX + taskId);
+    }
+
+    private static String errorMessage(Exception e)
+    {
+        String msg = e.getMessage();
+        if (StringUtils.isEmpty(msg))
+        {
+            msg = e.getClass().getSimpleName();
+        }
+        return msg;
+    }
+}