diff --git a/src/main/java/com/southern/power/grid/entity/DataExcelEntity.java b/src/main/java/com/southern/power/grid/entity/DataExcelEntity.java index a19db14..ad69a97 100644 --- a/src/main/java/com/southern/power/grid/entity/DataExcelEntity.java +++ b/src/main/java/com/southern/power/grid/entity/DataExcelEntity.java @@ -36,7 +36,7 @@ public class DataExcelEntity { @ExcelProperty(value = "停电结束时间") private LocalDateTime endTime; - @ExcelProperty(value = "停电时长") + @ExcelProperty(value = "停电时长(mins)") private Float lengthOutage ; @ExcelProperty(value = "停电影响用户数") 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 fb75883..6878bc3 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 @@ -12,6 +12,7 @@ import com.southern.power.grid.entity.WeatherSiteAreaConfiguration; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; @@ -59,6 +60,7 @@ public class HourlyOutageExcelProcessService { /** * 对外主入口:处理一批 Excel 解析后的数据,按逻辑补齐气象数据并批量入库 */ + @Transactional public void process(List excelRows) { // 1. 加载南网区划配置表 loadNwAreaConfig(); @@ -70,10 +72,10 @@ public class HourlyOutageExcelProcessService { // 3 & 4. 循环处理 Excel 行 for (DataExcelEntity row : excelRows) { - if(row.getLengthOutage()