|
@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
|
|
|
import cn.idev.excel.EasyExcel;
|
|
import cn.idev.excel.EasyExcel;
|
|
|
import com.yingpai.stock.domain.bo.StockPoolHistoryBo;
|
|
import com.yingpai.stock.domain.bo.StockPoolHistoryBo;
|
|
|
import com.yingpai.stock.domain.vo.StockPoolHistoryVo;
|
|
import com.yingpai.stock.domain.vo.StockPoolHistoryVo;
|
|
|
|
|
+import com.yingpai.stock.service.IStockPoolAsyncService;
|
|
|
import com.yingpai.stock.service.IStockPoolHistoryService;
|
|
import com.yingpai.stock.service.IStockPoolHistoryService;
|
|
|
import jakarta.servlet.http.HttpServletResponse;
|
|
import jakarta.servlet.http.HttpServletResponse;
|
|
|
import jakarta.validation.constraints.NotEmpty;
|
|
import jakarta.validation.constraints.NotEmpty;
|
|
@@ -23,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
|
import java.net.URLEncoder;
|
|
import java.net.URLEncoder;
|
|
|
import java.nio.charset.StandardCharsets;
|
|
import java.nio.charset.StandardCharsets;
|
|
|
|
|
+import java.time.LocalDate;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
@@ -37,6 +39,7 @@ import java.util.List;
|
|
|
public class StockPoolHistoryController extends BaseController {
|
|
public class StockPoolHistoryController extends BaseController {
|
|
|
|
|
|
|
|
private final IStockPoolHistoryService stockPoolHistoryService;
|
|
private final IStockPoolHistoryService stockPoolHistoryService;
|
|
|
|
|
+ private final IStockPoolAsyncService stockPoolAsyncService;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 查询历史数据列表
|
|
* 查询历史数据列表
|
|
@@ -99,7 +102,21 @@ public class StockPoolHistoryController extends BaseController {
|
|
|
@RequestParam("file") MultipartFile file,
|
|
@RequestParam("file") MultipartFile file,
|
|
|
@RequestParam("recordDate") String recordDate,
|
|
@RequestParam("recordDate") String recordDate,
|
|
|
@RequestParam(value = "updateSupport", defaultValue = "true") boolean updateSupport) throws Exception {
|
|
@RequestParam(value = "updateSupport", defaultValue = "true") boolean updateSupport) throws Exception {
|
|
|
|
|
+
|
|
|
|
|
+ // 解析日期
|
|
|
|
|
+ LocalDate parsedRecordDate;
|
|
|
|
|
+ try {
|
|
|
|
|
+ parsedRecordDate = LocalDate.parse(recordDate);
|
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
|
+ return R.fail("记录日期格式错误,请使用 yyyy-MM-dd 格式");
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ // 执行导入(事务方法)
|
|
|
String message = stockPoolHistoryService.importData(file, recordDate, updateSupport);
|
|
String message = stockPoolHistoryService.importData(file, recordDate, updateSupport);
|
|
|
|
|
+
|
|
|
|
|
+ // 事务提交后,触发异步任务
|
|
|
|
|
+ stockPoolAsyncService.asyncProcessAfterImport(parsedRecordDate);
|
|
|
|
|
+
|
|
|
return R.ok(message);
|
|
return R.ok(message);
|
|
|
}
|
|
}
|
|
|
|
|
|