diff --git a/src/main/java/com/southern/power/grid/listener/DataExcelListener.java b/src/main/java/com/southern/power/grid/listener/DataExcelListener.java index e75f100..fa3958b 100644 --- a/src/main/java/com/southern/power/grid/listener/DataExcelListener.java +++ b/src/main/java/com/southern/power/grid/listener/DataExcelListener.java @@ -4,12 +4,14 @@ import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.southern.power.grid.dao.DataExcelMapper; import com.southern.power.grid.entity.DataExcelEntity; +import com.southern.power.grid.service.impl.HourlyOutageExcelProcessService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.DefaultTransactionDefinition; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -36,6 +38,9 @@ public class DataExcelListener extends AnalysisEventListener { // 手动事务管理器 private final PlatformTransactionManager transactionManager; + @Resource + private HourlyOutageExcelProcessService hourlyOutageExcelProcessService; + // 构造方法 -- 交给spring容器创建 public DataExcelListener(DataExcelMapper dataExcelMapper, PlatformTransactionManager transactionManager) { this.dataExcelMapper = dataExcelMapper; @@ -69,7 +74,7 @@ public class DataExcelListener extends AnalysisEventListener { try { // 批量插入(500条) - dataExcelMapper.batchInsert(cacheList); + hourlyOutageExcelProcessService.process(cacheList); // 提交事务 transactionManager.commit(status); diff --git a/src/main/java/com/southern/power/grid/service/impl/HourlyOutageExcelProcessService.java b/src/main/java/com/southern/power/grid/service/impl/HourlyOutageExcelProcessService.java index 8db084f..4eb31cd 100644 --- a/src/main/java/com/southern/power/grid/service/impl/HourlyOutageExcelProcessService.java +++ b/src/main/java/com/southern/power/grid/service/impl/HourlyOutageExcelProcessService.java @@ -50,7 +50,6 @@ public class HourlyOutageExcelProcessService { /** * 对外主入口:处理一批 Excel 解析后的数据,按逻辑补齐气象数据并批量入库 */ - @Transactional(rollbackFor = Exception.class) public void process(List excelRows) { // 1. 加载南网配置表 loadNwAreaConfig();