Browse Source

[0924] 增加功率数据同步

taosj 1 month ago
parent
commit
c37f0b17a1

+ 176 - 0
forecast-backend-server/src/main/java/com/ufo/project/data/processer/AbstraceDataFileProcesser.java

@@ -1,10 +1,30 @@
 package com.ufo.project.data.processer;
 
+import java.io.File;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.ufo.base.common.utils.StringUtils;
+import com.ufo.module.system.domain.SysDictData;
+import com.ufo.module.system.service.ISysDictTypeService;
+import com.ufo.project.config.domain.ConfigStation;
+import com.ufo.project.config.service.IConfigStationService;
 import com.ufo.project.data.domain.DataFileSyncFiles;
 import com.ufo.project.data.service.IDataFileSyncFilesService;
 
@@ -23,9 +43,24 @@ public abstract class AbstraceDataFileProcesser implements DataFileProcesser
 
     /** 失败原因最大长度 */
     private static final int MAX_FAIL_REASON_LENGTH = 100;
+    /** 场站编码-文件映射字典类型: key=文件名首段编码, value=config_station.station_code */
+    protected static final String DICT_TYPE_STATION_FILE_CODE_MAPPING = "station_file_code_mapping";
+    /** 文件名起报时间格式(UTC) */
+    protected static final DateTimeFormatter START_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHH");
+    /** csv date_time列格式(GMT+8) */
+    protected static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH:mm:ss");
+
+    /** GMT+8时区偏移 */
+    protected static final ZoneOffset ZONE_GMT8 = ZoneOffset.ofHours(8);
+    /** 批量处理大小 */
+    protected static final int BATCH_SIZE = 500;
 
     @Autowired
     protected IDataFileSyncFilesService dataFileSyncFilesService;
+    @Autowired
+    protected ISysDictTypeService dictTypeService;
+    @Autowired
+    protected IConfigStationService configStationService;
 
     /**
      * 处理单个待同步文件: 解析保存 + 回写状态
@@ -83,4 +118,145 @@ public abstract class AbstraceDataFileProcesser implements DataFileProcesser
             log.error("[DataFileProcesser] 回写处理状态失败, id={}, file={}", file.getId(), file.getFile(), e);
         }
     }
+
+    /**
+     * 按字典 场站编码-文件映射 将文件名首段编码换算为场站编码, 未配置返回null
+     */
+    protected List<SysDictData> getStationCodeMappingConfigs()
+    {
+        return dictTypeService.selectDictDataByType(DICT_TYPE_STATION_FILE_CODE_MAPPING);
+    }
+    /**
+     * 按字典 场站编码-文件映射 将文件名首段编码换算为场站编码, 未配置返回null
+     */
+    protected String resolveStationCode(String fileCode)
+    {
+        List<SysDictData> dictList = getStationCodeMappingConfigs();
+        if (dictList == null || dictList.isEmpty())
+        {
+            return null;
+        }
+        String dictValue = dictList.get(0).getDictValue();
+        if (StringUtils.isBlank(dictValue))
+        {
+            return null;
+        }
+        JSONObject mapping = JSON.parseObject(dictValue);
+        return mapping.getString(fileCode);
+    }
+
+        /**
+     * 文件名起报时间(yyyyMMddHH, 已是UTC)转epoch秒
+     */
+    protected long parseStartEpoch(String timestamp)
+    {
+        return LocalDateTime.parse(timestamp, START_TIME_FORMATTER).toEpochSecond(ZoneOffset.UTC);
+    }
+
+        /**
+     * 按场站编码查询config_station, 查不到返回null
+     */
+    protected ConfigStation findStation(String stationCode)
+    {
+        ConfigStation query = new ConfigStation();
+        query.setStationCode(stationCode);
+        List<ConfigStation> stations = configStationService.selectConfigStationList(query);
+        if (stations == null || stations.isEmpty())
+        {
+            return null;
+        }
+        return stations.get(0);
+    }
+
+        /**
+     * EasyExcel读csv, 返回 表头->单元格值 的行列表
+     */
+    protected List<Map<String, String>> readCsv(File csvFile)
+    {
+        List<Map<String, String>> rows = new ArrayList<>();
+        Map<Integer, String> headMap = new HashMap<>();
+        EasyExcel.read(csvFile, new AnalysisEventListener<Map<Integer, String>>()
+        {
+            @Override
+            public void invokeHeadMap(Map<Integer, String> head, AnalysisContext context)
+            {
+                headMap.putAll(head);
+            }
+
+            @Override
+            public void invoke(Map<Integer, String> data, AnalysisContext context)
+            {
+                Map<String, String> row = new HashMap<>();
+                for (Map.Entry<Integer, String> cell : data.entrySet())
+                {
+                    String head = headMap.get(cell.getKey());
+                    if (StringUtils.isNotBlank(head))
+                    {
+                        row.put(head.trim(), cell.getValue());
+                    }
+                }
+                rows.add(row);
+            }
+
+            @Override
+            public void doAfterAllAnalysed(AnalysisContext context)
+            {
+            }
+        }).excelType(ExcelTypeEnum.CSV).sheet().headRowNumber(1).doRead();
+        return rows;
+    }
+
+        /**
+     * date_time(yyyy-MM-dd_HH:mm:ss, GMT+8)转UTC epoch秒
+     */
+    protected Long parseForecastEpoch(String dateTime, int rowNumber)
+    {
+        try
+        {
+            return LocalDateTime.parse(dateTime, DATE_TIME_FORMATTER).toEpochSecond(ZONE_GMT8);
+        }
+        catch (Exception e)
+        {
+            throw new IllegalArgumentException("第" + rowNumber + "行date_time格式错误: " + dateTime);
+        }
+    }
+
+        /**
+     * 按size切分列表
+     */
+    protected static <T> List<List<T>> partition(List<T> list, int size)
+    {
+        if (list.isEmpty())
+        {
+            return Collections.emptyList();
+        }
+        List<List<T>> batches = new ArrayList<>();
+        for (int i = 0; i < list.size(); i += size)
+        {
+            batches.add(list.subList(i, Math.min(i + size, list.size())));
+        }
+        return batches;
+    }
+
+        /**
+     * 下划线字段名转驼峰属性名(lat -> latitude已在配置中给出完整目标名, 此处处理带下划线的情况)
+     */
+    protected static String toCamelCase(String dbField)
+    {
+        StringBuilder camel = new StringBuilder(dbField.length());
+        boolean upperNext = false;
+        for (char c : dbField.toCharArray())
+        {
+            if (c == '_')
+            {
+                upperNext = true;
+            }
+            else
+            {
+                camel.append(upperNext ? Character.toUpperCase(c) : c);
+                upperNext = false;
+            }
+        }
+        return camel.toString();
+    }
 }

+ 543 - 0
forecast-backend-server/src/main/java/com/ufo/project/data/processer/DataFileProcesserPowerImpl.java

@@ -0,0 +1,543 @@
+package com.ufo.project.data.processer;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.nio.file.Path;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.ufo.base.common.utils.StringUtils;
+import com.ufo.module.system.domain.SysDictData;
+import com.ufo.project.config.domain.ConfigStation;
+import com.ufo.project.data.domain.DataFileSyncFiles;
+import com.ufo.project.forecast.mediumterm.power.domain.DataMediumTermPowerForecastRaw;
+import com.ufo.project.forecast.mediumterm.power.mapper.DataMediumTermPowerForecastRawMapper;
+import com.ufo.project.forecast.shortterm.power.domain.DataShortTermPowerForecastRaw;
+import com.ufo.project.forecast.shortterm.power.mapper.DataShortTermPowerForecastRawMapper;
+import com.ufo.project.forecast.supershort.domain.DataSuperShortTermForecastRaw;
+import com.ufo.project.forecast.supershort.mapper.DataSuperShortTermForecastRawMapper;
+
+/**
+ * 功率预测数据文件处理器(短期/中期/超短期)
+ *
+ * 处理形如 {@code /home/power/upload/power/JMJD01/MediumTerm/2026-09-2026090312.csv} 的功率csv文件:
+ * 1. 逐级目录匹配字典 station_file_code_mapping(场站编码-文件映射)的key, 取value为场站编码;
+ * 2. 目录含 MediumTerm 为中期、ShortTerm 为短期、UltraShortTerm 为超短期(优先判定), 分别写入
+ *    data_medium_term_power_forecast_raw / data_short_term_power_forecast_raw /
+ *    data_super_short_term_forecast_raw;
+ * 3. 文件名中 yyyyMMddHH(超短期为yyyyMMddHHmm, 已是UTC)转为起报时间start_time(epoch秒);
+ * 4. EasyExcel读csv, 按fieldMappingConfig映射(time -> forecast_time, ISO格式如 2026-09-19T12:00Z,
+ *    本身即UTC; power -> power), 经纬度/场站等其余字段按任务约定取固定元数据与场站信息;
+ * 5. 按(station_id, start_time)查询已有记录, 以(start_time, forecast_time)匹配,
+ *    已存在的批量更新power, 新数据批量插入, 每500条一批.
+ *
+ * @author ufo
+ * @date 2026-09-22
+ */
+@Service("dataFileProcesserPower")
+public class DataFileProcesserPowerImpl extends AbstraceDataFileProcesser
+{
+    private static final Logger log = LoggerFactory.getLogger(DataFileProcesserPowerImpl.class);
+
+    /** 短期目录段 */
+    private static final String DIR_SHORT_TERM = "ShortTerm";
+    /** 中期目录段 */
+    private static final String DIR_MEDIUM_TERM = "MediumTerm";
+    /** 超短期目录段(名称含ShortTerm字样, 需优先判定) */
+    private static final String DIR_ULTRA_SHORT_TERM = "UltraShortTerm";
+
+    /** 文件名: yyyyMMddHH(超短期为yyyyMMddHHmm).csv, 时间戳为UTC, 包级可见便于测试 */
+    static final Pattern FILE_NAME_PATTERN = Pattern.compile("(\\d{12}|\\d{10})\\.csv$", Pattern.CASE_INSENSITIVE);
+
+    /** 文件名起报时间格式(超短期, UTC) */
+    private static final DateTimeFormatter START_MINUTE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHHmm");
+
+    /** csv time列格式(ISO, 含Z即UTC), 如 2026-09-19T12:00Z */
+    private static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+
+    /** csv表头: 预测时间(ISO格式) */
+    private static final String HEADER_TIME = "time";
+    /** csv表头: 预测功率 */
+    private static final String HEADER_POWER = "power";
+
+    /** csv表头 -> 功率原始数据字段 映射 */
+    private static final Map<String, String> fieldMappingConfig = new LinkedHashMap<>();
+
+    static
+    {
+        fieldMappingConfig.put(HEADER_TIME, "forecast_time");
+        fieldMappingConfig.put(HEADER_POWER, "power");
+    }
+
+    /** 实体字段反射缓存: 类#字段名 -> Field */
+    private static final Map<String, Field> ENTITY_FIELDS = new HashMap<>();
+
+    /** 插入行的公共元数据(列均NOT NULL) */
+    private static final String DATA_ORG_TYPE = "SinglePointTimeSeries";
+    private static final Long DATA_TYPE = 10L;
+    private static final Long BUSINESS_PROCESS_TYPE = 0L;
+    private static final String ENTITY_TYPE = "pv_station";
+    private static final String MACHINE_NAME = "";
+    private static final Long ANALYZE_HIS_ID = 0L;
+    private static final Long ARCHIVE_RECORD_ID = 0L;
+
+    /** 短期/中期/超短期各自的元数据组(id同时用作data_source/data_sourcegrab_id/data_model_id/source_id/subject_id/machine_id) */
+    static final Term SHORT_TERM = new Term(Kind.SHORT, 5001L, "EC", "ShortTermModel", "短期", 3L, 72L);
+    static final Term MEDIUM_TERM = new Term(Kind.MEDIUM, 5002L, "WRF", "MediumTermModel", "中期", 10L, 240L);
+    static final Term ULTRA_SHORT_TERM = new Term(Kind.ULTRA, 5003L, "EC/WRF", "UltraShortTermModel", "超短期", 0L, 4L, 16L);
+
+    @Autowired
+    private DataShortTermPowerForecastRawMapper dataShortTermPowerForecastRawMapper;
+
+    @Autowired
+    private DataMediumTermPowerForecastRawMapper dataMediumTermPowerForecastRawMapper;
+
+    @Autowired
+    private DataSuperShortTermForecastRawMapper dataSuperShortTermForecastRawMapper;
+
+    @Override
+    protected String parseAndSave(DataFileSyncFiles file)
+    {
+        File csvFile = new File(file.getFile());
+        if (!csvFile.isFile())
+        {
+            return "文件不存在: " + file.getFile();
+        }
+        Matcher matcher = FILE_NAME_PATTERN.matcher(csvFile.getName());
+        if (!matcher.find())
+        {
+            return "文件名格式不符合(需yyyyMMddHH.csv, 超短期yyyyMMddHHmm.csv): " + csvFile.getName();
+        }
+        long startTime = parseFileNameEpoch(matcher.group(1));
+
+        Path path = csvFile.toPath().toAbsolutePath().normalize();
+        Term term = resolveTerm(path);
+        if (term == null)
+        {
+            return "路径未识别" + DIR_SHORT_TERM + "/" + DIR_MEDIUM_TERM + "/" + DIR_ULTRA_SHORT_TERM + "目录: " + path;
+        }
+        String stationCode = resolveStationCodeByDirectory(path);
+        if (StringUtils.isBlank(stationCode))
+        {
+            return "路径目录未匹配场站编码映射: " + path;
+        }
+        ConfigStation station = findStation(stationCode);
+        if (station == null)
+        {
+            return "场站不存在: " + stationCode;
+        }
+
+        // csv行 -> forecast_time唯一(后行覆盖前行)
+        Map<Long, String> powerByForecastTime = parseRows(readCsv(csvFile));
+        if (powerByForecastTime.isEmpty())
+        {
+            return "csv无有效数据行";
+        }
+
+        int[] result;
+        switch (term.kind)
+        {
+            case SHORT:
+                result = saveShortTerm(term, station, startTime, powerByForecastTime);
+                break;
+            case MEDIUM:
+                result = saveMediumTerm(term, station, startTime, powerByForecastTime);
+                break;
+            default:
+                result = saveUltraShortTerm(term, station, startTime, powerByForecastTime);
+                break;
+        }
+        log.info("[DataFileProcesserPower] 处理完成, file={}, 场站={}, {}, start_time={}, 更新{}条, 新增{}条",
+                csvFile.getName(), stationCode, term.subjectName, startTime, result[0], result[1]);
+        return "";
+    }
+
+    /**
+     * 按目录段判断短期/中期/超短期(逐级目录, 不含文件名); UltraShortTerm优先于ShortTerm判定,
+     * 与其余两类同时出现视为歧义返回null
+     */
+    Term resolveTerm(Path path)
+    {
+        boolean shortTerm = false;
+        boolean mediumTerm = false;
+        boolean ultraTerm = false;
+        int nameCount = path.getNameCount();
+        for (int i = 0; i < nameCount - 1; i++)
+        {
+            String segment = path.getName(i).toString();
+            if (DIR_ULTRA_SHORT_TERM.equalsIgnoreCase(segment))
+            {
+                ultraTerm = true;
+            }
+            else if (DIR_SHORT_TERM.equalsIgnoreCase(segment))
+            {
+                shortTerm = true;
+            }
+            else if (DIR_MEDIUM_TERM.equalsIgnoreCase(segment))
+            {
+                mediumTerm = true;
+            }
+        }
+        if (ultraTerm)
+        {
+            return mediumTerm ? null : ULTRA_SHORT_TERM;
+        }
+        if (shortTerm == mediumTerm)
+        {
+            return null;
+        }
+        return shortTerm ? SHORT_TERM : MEDIUM_TERM;
+    }
+
+    /**
+     * 逐级目录(不含文件名)匹配字典 场站编码-文件映射 的key, 返回命中的value(场站编码), 未命中返回null
+     */
+    private String resolveStationCodeByDirectory(Path path)
+    {
+        Map<String, String> mapping = loadStationCodeMapping();
+        if (mapping.isEmpty())
+        {
+            return null;
+        }
+        return matchStationCode(path, mapping);
+    }
+
+    /**
+     * 目录段与映射key逐级匹配(不含文件名)
+     */
+    static String matchStationCode(Path path, Map<String, String> mapping)
+    {
+        int nameCount = path.getNameCount();
+        for (int i = 0; i < nameCount - 1; i++)
+        {
+            String stationCode = mapping.get(path.getName(i).toString());
+            if (StringUtils.isNotBlank(stationCode))
+            {
+                return stationCode;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 汇总字典 station_file_code_mapping 各条JSON配置为 key(目录编码) -> value(场站编码)
+     */
+    private Map<String, String> loadStationCodeMapping()
+    {
+        Map<String, String> mapping = new HashMap<>();
+        List<SysDictData> dictList = getStationCodeMappingConfigs();
+        if (dictList == null)
+        {
+            return mapping;
+        }
+        for (SysDictData dict : dictList)
+        {
+            if (StringUtils.isBlank(dict.getDictValue()))
+            {
+                continue;
+            }
+            JSONObject json = JSON.parseObject(dict.getDictValue());
+            for (String key : json.keySet())
+            {
+                mapping.put(key, json.getString(key));
+            }
+        }
+        return mapping;
+    }
+
+    /**
+     * csv行 -> forecast_time -> power; time缺失/格式错误直接抛错(由execute捕获回写失败原因)
+     */
+    /** 包级可见便于测试 */
+    Map<Long, String> parseRows(List<Map<String, String>> rows)
+    {
+        Map<Long, String> powerByForecastTime = new LinkedHashMap<>();
+        for (int i = 0; i < rows.size(); i++)
+        {
+            int rowNumber = i + 2;
+            Map<String, String> row = rows.get(i);
+            String time = StringUtils.trimToNull(row.get(HEADER_TIME));
+            if (time == null)
+            {
+                throw new IllegalArgumentException("第" + rowNumber + "行缺少" + HEADER_TIME + "列");
+            }
+            long forecastTime;
+            try
+            {
+                forecastTime = OffsetDateTime.parse(time, TIME_FORMATTER).toEpochSecond();
+            }
+            catch (Exception e)
+            {
+                throw new IllegalArgumentException("第" + rowNumber + "行" + HEADER_TIME + "格式错误(需2026-09-19T12:00Z): " + time);
+            }
+            powerByForecastTime.put(forecastTime, StringUtils.trimToNull(row.get(HEADER_POWER)));
+        }
+        return powerByForecastTime;
+    }
+
+    /**
+     * 短期: 查重分类 + 500一批更新/插入 data_short_term_power_forecast_raw
+     *
+     * @return int[]{更新条数, 新增条数}
+     */
+    private int[] saveShortTerm(Term term, ConfigStation station, long startTime, Map<Long, String> powerByForecastTime)
+    {
+        return saveTerm(term, station, startTime, powerByForecastTime,
+                DataShortTermPowerForecastRaw::new,
+                dataShortTermPowerForecastRawMapper::selectDataShortTermPowerForecastRawList,
+                dataShortTermPowerForecastRawMapper::batchUpdateDataShortTermPowerForecastRaw,
+                dataShortTermPowerForecastRawMapper::batchInsertDataShortTermPowerForecastRaw);
+    }
+
+    /**
+     * 中期: 查重分类 + 500一批更新/插入 data_medium_term_power_forecast_raw
+     *
+     * @return int[]{更新条数, 新增条数}
+     */
+    private int[] saveMediumTerm(Term term, ConfigStation station, long startTime, Map<Long, String> powerByForecastTime)
+    {
+        return saveTerm(term, station, startTime, powerByForecastTime,
+                DataMediumTermPowerForecastRaw::new,
+                dataMediumTermPowerForecastRawMapper::selectDataMediumTermPowerForecastRawList,
+                dataMediumTermPowerForecastRawMapper::batchUpdateDataMediumTermPowerForecastRaw,
+                dataMediumTermPowerForecastRawMapper::batchInsertDataMediumTermPowerForecastRaw);
+    }
+
+    /**
+     * 超短期: 查重分类 + 500一批更新/插入 data_super_short_term_forecast_raw
+     *
+     * @return int[]{更新条数, 新增条数}
+     */
+    private int[] saveUltraShortTerm(Term term, ConfigStation station, long startTime, Map<Long, String> powerByForecastTime)
+    {
+        return saveTerm(term, station, startTime, powerByForecastTime,
+                DataSuperShortTermForecastRaw::new,
+                dataSuperShortTermForecastRawMapper::selectDataSuperShortTermForecastRawList,
+                dataSuperShortTermForecastRawMapper::batchUpdateDataSuperShortTermForecastRaw,
+                dataSuperShortTermForecastRawMapper::batchInsertDataSuperShortTermForecastRaw);
+    }
+
+    /**
+     * 三条链路共用: 按(station_id, start_time)查已有记录, 以forecast_time匹配,
+     * 已有置Id进更新组、其余进插入组, 各按BATCH_SIZE一批写库;
+     * 三类实体无公共父类故stationId/startTime/Id/forecastTime经反射读写(与fillPowerCommon同法)
+     *
+     * @return int[]{更新条数, 新增条数}
+     */
+    private <T> int[] saveTerm(Term term, ConfigStation station, long startTime, Map<Long, String> powerByForecastTime,
+            Supplier<T> factory, Function<T, List<T>> selectList,
+            Consumer<List<T>> batchUpdate, Consumer<List<T>> batchInsert)
+    {
+        T query = factory.get();
+        setEntityField(query, "stationId", station.getId());
+        setEntityField(query, "startTime", startTime);
+        List<T> dbList = selectList.apply(query);
+        Map<Long, Long> existIds = new HashMap<>();
+        for (T db : dbList)
+        {
+            Long forecastTime = (Long) getEntityField(db, "forecastTime");
+            Long id = (Long) getEntityField(db, "Id");
+            if (forecastTime != null && id != null)
+            {
+                existIds.putIfAbsent(forecastTime, id);
+            }
+        }
+        List<T> dbExistList = new ArrayList<>();
+        List<T> newList = new ArrayList<>();
+        for (Map.Entry<Long, String> row : powerByForecastTime.entrySet())
+        {
+            T raw = factory.get();
+            fillPowerCommon(raw, term, station, startTime, row.getKey(), row.getValue());
+            Long existId = existIds.get(row.getKey());
+            if (existId != null)
+            {
+                setEntityField(raw, "Id", existId);
+                dbExistList.add(raw);
+            }
+            else
+            {
+                newList.add(raw);
+            }
+        }
+        for (List<T> batch : partition(dbExistList, BATCH_SIZE))
+        {
+            batchUpdate.accept(batch);
+        }
+        for (List<T> batch : partition(newList, BATCH_SIZE))
+        {
+            batchInsert.accept(batch);
+        }
+        return new int[]{dbExistList.size(), newList.size()};
+    }
+
+    /**
+     * 写入三条链路共有的元数据/场站/时间/功率字段(三类实体字段同名, 无公共父类故用反射);
+     * preQrts仅超短期实体存在, 只在term.preQrts非空时写入
+     */
+    void fillPowerCommon(Object raw, Term term, ConfigStation station, long startTime, long forecastTime, String power)
+    {
+        Map<String, Object> values = new LinkedHashMap<>();
+        values.put("latitude", station.getLatitude());
+        values.put("longitude", station.getLongitude());
+        values.put("dataOrgType", DATA_ORG_TYPE);
+        values.put("dataType", DATA_TYPE);
+        values.put("businessProcessType", BUSINESS_PROCESS_TYPE);
+        values.put("dataSource", term.id);
+        values.put("dataSourcegrabId", term.id);
+        values.put("dataSourcegrabPatternName", term.patternName);
+        values.put("dataModelId", term.id);
+        values.put("dataModelName", term.dataModelName);
+        values.put("sourceId", term.id);
+        values.put("sourceName", term.patternName);
+        values.put("entityId", String.valueOf(station.getId()));
+        values.put("entityType", ENTITY_TYPE);
+        values.put("startTime", startTime);
+        values.put("forecastTime", forecastTime);
+        values.put("preDays", term.preDays);
+        values.put("leadTime", term.leadTime);
+        if (term.preQrts != null)
+        {
+            values.put("preQrts", term.preQrts);
+        }
+        values.put("stationId", station.getId());
+        values.put("stationName", station.getStationName());
+        values.put("subjectId", term.id);
+        values.put("subjectName", term.subjectName);
+        values.put("machineId", String.valueOf(term.id));
+        values.put("machineName", MACHINE_NAME);
+        values.put("analyzeHisId", ANALYZE_HIS_ID);
+        values.put("archiveRecordId", ARCHIVE_RECORD_ID);
+        values.put("power", power);
+        for (Map.Entry<String, Object> value : values.entrySet())
+        {
+            setEntityField(raw, value.getKey(), value.getValue());
+        }
+    }
+
+    /**
+     * 解析文件名时间戳为起报epoch秒(UTC): 短期/中期10位yyyyMMddHH, 超短期12位yyyyMMddHHmm
+     */
+    static long parseFileNameEpoch(String timestamp)
+    {
+        DateTimeFormatter formatter = timestamp.length() == 12 ? START_MINUTE_FORMATTER : START_TIME_FORMATTER;
+        return LocalDateTime.parse(timestamp, formatter).toEpochSecond(ZoneOffset.UTC);
+    }
+
+    /**
+     * 解析csv time列(ISO格式, 含Z即UTC)为epoch秒, 包级可见便于测试
+     */
+    static long parseIsoEpoch(String time)
+    {
+        return OffsetDateTime.parse(time, TIME_FORMATTER).toEpochSecond();
+    }
+
+    /**
+     * 反射写入实体声明字段
+     */
+    private static void setEntityField(Object entity, String fieldName, Object value)
+    {
+        try
+        {
+            entityField(entity.getClass(), fieldName).set(entity, value);
+        }
+        catch (IllegalAccessException e)
+        {
+            throw new IllegalStateException("写入字段" + fieldName + "失败", e);
+        }
+    }
+
+    /**
+     * 反射读取实体声明字段
+     */
+    private static Object getEntityField(Object entity, String fieldName)
+    {
+        try
+        {
+            return entityField(entity.getClass(), fieldName).get(entity);
+        }
+        catch (IllegalAccessException e)
+        {
+            throw new IllegalStateException("读取字段" + fieldName + "失败", e);
+        }
+    }
+
+    /**
+     * 取(并缓存)实体声明字段
+     */
+    private static Field entityField(Class<?> clazz, String fieldName)
+    {
+        String key = clazz.getName() + "#" + fieldName;
+        Field cached = ENTITY_FIELDS.get(key);
+        if (cached != null)
+        {
+            return cached;
+        }
+        try
+        {
+            Field field = clazz.getDeclaredField(fieldName);
+            field.setAccessible(true);
+            ENTITY_FIELDS.put(key, field);
+            return field;
+        }
+        catch (NoSuchFieldException e)
+        {
+            throw new IllegalStateException("实体缺少字段: " + clazz.getSimpleName() + "." + fieldName, e);
+        }
+    }
+
+    /** 时效类型(路由到各自保存链路与实体) */
+    enum Kind
+    {
+        SHORT, MEDIUM, ULTRA
+    }
+
+    /** 短期/中期/超短期元数据组 */
+    static final class Term
+    {
+        final Kind kind;
+        private final Long id;
+        private final String patternName;
+        private final String dataModelName;
+        final String subjectName;
+        private final Long preDays;
+        private final Long leadTime;
+        /** 预报刻数, 仅超短期实体有preQrts字段, 其余为null不写入 */
+        private final Long preQrts;
+
+        private Term(Kind kind, Long id, String patternName, String dataModelName, String subjectName, Long preDays, Long leadTime)
+        {
+            this(kind, id, patternName, dataModelName, subjectName, preDays, leadTime, null);
+        }
+
+        private Term(Kind kind, Long id, String patternName, String dataModelName, String subjectName, Long preDays, Long leadTime, Long preQrts)
+        {
+            this.kind = kind;
+            this.id = id;
+            this.patternName = patternName;
+            this.dataModelName = dataModelName;
+            this.subjectName = subjectName;
+            this.preDays = preDays;
+            this.leadTime = leadTime;
+            this.preQrts = preQrts;
+        }
+    }
+}

+ 0 - 168
forecast-backend-server/src/main/java/com/ufo/project/data/processer/DataFileProcesserWeatherImpl.java

@@ -2,11 +2,7 @@ package com.ufo.project.data.processer;
 
 import java.io.File;
 import java.lang.reflect.Field;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -17,20 +13,10 @@ import java.util.regex.Pattern;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import com.alibaba.excel.support.ExcelTypeEnum;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
 import com.ufo.base.common.utils.StringUtils;
-import com.ufo.module.system.domain.SysDictData;
-import com.ufo.module.system.service.ISysDictTypeService;
 import com.ufo.project.config.domain.ConfigStation;
-import com.ufo.project.config.service.IConfigStationService;
 import com.ufo.project.data.domain.DataFileSyncFiles;
 import com.ufo.project.forecast.shortterm.weather.domain.DataShortTermWeatherForecastRaw;
 import com.ufo.project.forecast.shortterm.weather.mapper.DataShortTermWeatherForecastRawMapper;
@@ -55,25 +41,10 @@ public class DataFileProcesserWeatherImpl extends AbstraceDataFileProcesser
 {
     private static final Logger log = LoggerFactory.getLogger(DataFileProcesserWeatherImpl.class);
 
-    /** 场站编码-文件映射字典类型: key=文件名首段编码, value=config_station.station_code */
-    public static final String DICT_TYPE_STATION_FILE_CODE_MAPPING = "station_file_code_mapping";
-
     /** 文件名: 编码_经度-纬度_yyyyMMddHH_来源.csv (时间戳为UTC) */
     private static final Pattern FILE_NAME_PATTERN =
             Pattern.compile("^([^_]+)_(-?[\\d.]+)-(-?[\\d.]+)_(\\d{10})(?:_[^_]*)?\\.csv$", Pattern.CASE_INSENSITIVE);
 
-    /** 文件名起报时间格式(UTC) */
-    private static final DateTimeFormatter START_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMddHH");
-
-    /** csv date_time列格式(GMT+8) */
-    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH:mm:ss");
-
-    /** GMT+8时区偏移 */
-    private static final ZoneOffset ZONE_GMT8 = ZoneOffset.ofHours(8);
-
-    /** 批量处理大小 */
-    private static final int BATCH_SIZE = 500;
-
     /** csv表头 -> data_short_term_weather_forecast_raw字段 映射 */
     private static final Map<String, String> fieldMappingConfig = new LinkedHashMap<>();
 
@@ -132,12 +103,6 @@ public class DataFileProcesserWeatherImpl extends AbstraceDataFileProcesser
     private static final Long PRE_DAYS = 10L;
     private static final Long LEAD_TIME = 10L;
 
-    @Autowired
-    private ISysDictTypeService dictTypeService;
-
-    @Autowired
-    private IConfigStationService configStationService;
-
     @Autowired
     private DataShortTermWeatherForecastRawMapper dataShortTermWeatherForecastRawMapper;
 
@@ -226,85 +191,6 @@ public class DataFileProcesserWeatherImpl extends AbstraceDataFileProcesser
         return "";
     }
 
-    /**
-     * 文件名起报时间(yyyyMMddHH, 已是UTC)转epoch秒
-     */
-    long parseStartEpoch(String timestamp)
-    {
-        return LocalDateTime.parse(timestamp, START_TIME_FORMATTER).toEpochSecond(ZoneOffset.UTC);
-    }
-
-    /**
-     * 按字典 场站编码-文件映射 将文件名首段编码换算为场站编码, 未配置返回null
-     */
-    private String resolveStationCode(String fileCode)
-    {
-        List<SysDictData> dictList = dictTypeService.selectDictDataByType(DICT_TYPE_STATION_FILE_CODE_MAPPING);
-        if (dictList == null || dictList.isEmpty())
-        {
-            return null;
-        }
-        String dictValue = dictList.get(0).getDictValue();
-        if (StringUtils.isBlank(dictValue))
-        {
-            return null;
-        }
-        JSONObject mapping = JSON.parseObject(dictValue);
-        return mapping.getString(fileCode);
-    }
-
-    /**
-     * 按场站编码查询config_station, 查不到返回null
-     */
-    private ConfigStation findStation(String stationCode)
-    {
-        ConfigStation query = new ConfigStation();
-        query.setStationCode(stationCode);
-        List<ConfigStation> stations = configStationService.selectConfigStationList(query);
-        if (stations == null || stations.isEmpty())
-        {
-            return null;
-        }
-        return stations.get(0);
-    }
-
-    /**
-     * EasyExcel读csv, 返回 表头->单元格值 的行列表
-     */
-    List<Map<String, String>> readCsv(File csvFile)
-    {
-        List<Map<String, String>> rows = new ArrayList<>();
-        Map<Integer, String> headMap = new HashMap<>();
-        EasyExcel.read(csvFile, new AnalysisEventListener<Map<Integer, String>>()
-        {
-            @Override
-            public void invokeHeadMap(Map<Integer, String> head, AnalysisContext context)
-            {
-                headMap.putAll(head);
-            }
-
-            @Override
-            public void invoke(Map<Integer, String> data, AnalysisContext context)
-            {
-                Map<String, String> row = new HashMap<>();
-                for (Map.Entry<Integer, String> cell : data.entrySet())
-                {
-                    String head = headMap.get(cell.getKey());
-                    if (StringUtils.isNotBlank(head))
-                    {
-                        row.put(head.trim(), cell.getValue());
-                    }
-                }
-                rows.add(row);
-            }
-
-            @Override
-            public void doAfterAllAnalysed(AnalysisContext context)
-            {
-            }
-        }).excelType(ExcelTypeEnum.CSV).sheet().headRowNumber(1).doRead();
-        return rows;
-    }
 
     /**
      * csv单行 -> 短期气象原始数据实体(含固定元数据与场站信息)
@@ -359,21 +245,6 @@ public class DataFileProcesserWeatherImpl extends AbstraceDataFileProcesser
         return raw;
     }
 
-    /**
-     * date_time(yyyy-MM-dd_HH:mm:ss, GMT+8)转UTC epoch秒
-     */
-    private Long parseForecastEpoch(String dateTime, int rowNumber)
-    {
-        try
-        {
-            return LocalDateTime.parse(dateTime, DATE_TIME_FORMATTER).toEpochSecond(ZONE_GMT8);
-        }
-        catch (Exception e)
-        {
-            throw new IllegalArgumentException("第" + rowNumber + "行date_time格式错误: " + dateTime);
-        }
-    }
-
     /**
      * 查询同一场站同一起报时间的已有记录, 返回 forecast_time -> 主键Id
      */
@@ -397,43 +268,4 @@ public class DataFileProcesserWeatherImpl extends AbstraceDataFileProcesser
         }
         return existIds;
     }
-
-    /**
-     * 按size切分列表
-     */
-    private static <T> List<List<T>> partition(List<T> list, int size)
-    {
-        if (list.isEmpty())
-        {
-            return Collections.emptyList();
-        }
-        List<List<T>> batches = new ArrayList<>();
-        for (int i = 0; i < list.size(); i += size)
-        {
-            batches.add(list.subList(i, Math.min(i + size, list.size())));
-        }
-        return batches;
-    }
-
-    /**
-     * 下划线字段名转驼峰属性名(lat -> latitude已在配置中给出完整目标名, 此处处理带下划线的情况)
-     */
-    private static String toCamelCase(String dbField)
-    {
-        StringBuilder camel = new StringBuilder(dbField.length());
-        boolean upperNext = false;
-        for (char c : dbField.toCharArray())
-        {
-            if (c == '_')
-            {
-                upperNext = true;
-            }
-            else
-            {
-                camel.append(upperNext ? Character.toUpperCase(c) : c);
-                upperNext = false;
-            }
-        }
-        return camel.toString();
-    }
 }

+ 1 - 1
forecast-backend-server/src/main/java/com/ufo/project/data/task/DataFileProcessTask.java

@@ -28,7 +28,7 @@ public class DataFileProcessTask
     private static final Logger log = LoggerFactory.getLogger(DataFileProcessTask.class);
 
     /** 处理间隔(毫秒), 每轮结束后间隔27秒 */
-    private static final long PROCESS_INTERVAL_MILLIS = 27 * 1000L;
+    private static final long PROCESS_INTERVAL_MILLIS = 17 * 1000L;
 
     /** 默认处理器bean名称 */
     private static final String DEFAULT_PROCESSER_BEAN = "dataFileProcesserDefaltImpl";

+ 4 - 1
forecast-backend-server/src/main/java/com/ufo/project/data/task/DataFileSyncTask.java

@@ -47,7 +47,7 @@ public class DataFileSyncTask
     public static final String DICT_TYPE_DATA_FILE_SYNC_CONFIG = "data_file_sync_config";
 
     /** 扫描间隔(毫秒), 每轮结束后间隔63 */
-    private static final long SCAN_INTERVAL_MILLIS = 63 * 1000L;
+    private static final long SCAN_INTERVAL_MILLIS = 37 * 1000L;
 
     @Autowired
     private ISysDictTypeService dictTypeService;
@@ -151,6 +151,9 @@ public class DataFileSyncTask
             row.setHandler(config.getHandler());
             row.setProcessTimes(0);
             row.setPriority(DataFileSyncFiles.DEFAULT_PRIORITY);
+            if(row.getFile().indexOf("UltraShortTerm") >= 0){ // 超短期优先处理
+                row.setPriority(2);
+            }
             if (dataFileSyncFilesService.selectDataFileSyncFilesByFile(row.getFile()) != null)
             {
                 return true;

+ 16 - 0
forecast-backend-server/src/main/java/com/ufo/project/forecast/mediumterm/power/mapper/DataMediumTermPowerForecastRawMapper.java

@@ -58,4 +58,20 @@ public interface DataMediumTermPowerForecastRawMapper
      * @return 结果
      */
     public int deleteDataMediumTermPowerForecastRawByIds(Long[] Ids);
+
+    /**
+     * 批量新增中期功率原始数据(功率数据文件处理器)
+     *
+     * @param list 中期功率原始数据集合
+     * @return 结果
+     */
+    public int batchInsertDataMediumTermPowerForecastRaw(List<DataMediumTermPowerForecastRaw> list);
+
+    /**
+     * 按主键批量修改中期功率原始数据的预测功率(功率数据文件处理器)
+     *
+     * @param list 中期功率原始数据集合(需带主键Id)
+     * @return 结果
+     */
+    public int batchUpdateDataMediumTermPowerForecastRaw(List<DataMediumTermPowerForecastRaw> list);
 }

+ 16 - 0
forecast-backend-server/src/main/java/com/ufo/project/forecast/shortterm/power/mapper/DataShortTermPowerForecastRawMapper.java

@@ -58,4 +58,20 @@ public interface DataShortTermPowerForecastRawMapper
      * @return 结果
      */
     public int deleteDataShortTermPowerForecastRawByIds(Long[] Ids);
+
+    /**
+     * 批量新增短期功率原始数据(功率数据文件处理器)
+     *
+     * @param list 短期功率原始数据集合
+     * @return 结果
+     */
+    public int batchInsertDataShortTermPowerForecastRaw(List<DataShortTermPowerForecastRaw> list);
+
+    /**
+     * 按主键批量修改短期功率原始数据的预测功率(功率数据文件处理器)
+     *
+     * @param list 短期功率原始数据集合(需带主键Id)
+     * @return 结果
+     */
+    public int batchUpdateDataShortTermPowerForecastRaw(List<DataShortTermPowerForecastRaw> list);
 }

+ 17 - 1
forecast-backend-server/src/main/java/com/ufo/project/forecast/supershort/mapper/DataSuperShortTermForecastRawMapper.java

@@ -53,9 +53,25 @@ public interface DataSuperShortTermForecastRawMapper
 
     /**
      * 批量删除超短期功率原始数据
-     * 
+     *
      * @param Ids 需要删除的数据主键集合
      * @return 结果
      */
     public int deleteDataSuperShortTermForecastRawByIds(Long[] Ids);
+
+    /**
+     * 批量新增超短期功率原始数据(功率数据文件处理器)
+     *
+     * @param list 超短期功率原始数据集合
+     * @return 结果
+     */
+    public int batchInsertDataSuperShortTermForecastRaw(List<DataSuperShortTermForecastRaw> list);
+
+    /**
+     * 按主键批量修改超短期功率原始数据的预测功率(功率数据文件处理器)
+     *
+     * @param list 超短期功率原始数据集合(需带主键Id)
+     * @return 结果
+     */
+    public int batchUpdateDataSuperShortTermForecastRaw(List<DataSuperShortTermForecastRaw> list);
 }

+ 1 - 1
forecast-backend-server/src/main/resources/mybatis/data/DataFileSyncFilesMapper.xml

@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectPendingDataFileSyncFilesList" resultMap="DataFileSyncFilesResult">
         <include refid="selectDataFileSyncFilesVo"/>
         where status = 0
-        order by priority asc, process_times asc
+        order by priority asc, process_times asc, id asc
     </select>
 
     <select id="selectDataFileSyncFilesById" parameterType="Long" resultMap="DataFileSyncFilesResult">

+ 41 - 1
forecast-backend-server/src/main/resources/mybatis/mediumpower/DataMediumTermPowerForecastRawMapper.xml

@@ -183,9 +183,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteDataMediumTermPowerForecastRawByIds" parameterType="String">
-        delete from data_medium_term_power_forecast_raw where _id in 
+        delete from data_medium_term_power_forecast_raw where _id in
         <foreach item="Id" collection="array" open="(" separator="," close=")">
             #{Id}
         </foreach>
     </delete>
+
+    <!-- 批量新增(功率数据文件处理器): create_time 取当前epoch秒(列为INTEGER) -->
+    <insert id="batchInsertDataMediumTermPowerForecastRaw" parameterType="java.util.List">
+        insert into data_medium_term_power_forecast_raw (
+            latitude, longitude, data_org_type, data_type, business_process_type,
+            data_source, data_sourcegrab_id, data_sourcegrab_pattern_name,
+            data_model_id, data_model_name, source_id, source_name,
+            entity_id, entity_type, create_time, start_time, forecast_time,
+            pre_days, lead_time, station_id, station_name,
+            subject_id, subject_name, machine_id, machine_name,
+            analyze_his_id, archive_record_id, power
+        ) values
+        <foreach collection="list" item="item" separator=",">
+            (
+                #{item.latitude,jdbcType=VARCHAR}, #{item.longitude,jdbcType=VARCHAR},
+                #{item.dataOrgType}, #{item.dataType}, #{item.businessProcessType},
+                #{item.dataSource}, #{item.dataSourcegrabId}, #{item.dataSourcegrabPatternName},
+                #{item.dataModelId}, #{item.dataModelName}, #{item.sourceId}, #{item.sourceName},
+                #{item.entityId}, #{item.entityType}, EXTRACT(EPOCH FROM now())::INTEGER,
+                #{item.startTime}, #{item.forecastTime},
+                #{item.preDays}, #{item.leadTime}, #{item.stationId,jdbcType=BIGINT}, #{item.stationName,jdbcType=VARCHAR},
+                #{item.subjectId,jdbcType=INTEGER}, #{item.subjectName,jdbcType=VARCHAR},
+                #{item.machineId,jdbcType=VARCHAR}, #{item.machineName,jdbcType=VARCHAR},
+                #{item.analyzeHisId,jdbcType=INTEGER}, #{item.archiveRecordId,jdbcType=INTEGER},
+                #{item.power,jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
+
+    <!-- 批量修改(功率数据文件处理器): 按_id更新预测功率 -->
+    <update id="batchUpdateDataMediumTermPowerForecastRaw" parameterType="java.util.List">
+        update data_medium_term_power_forecast_raw as t
+        set power = v.power
+        from (values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.Id}::bigint, #{item.power,jdbcType=VARCHAR}::varchar)
+        </foreach>
+        ) as v(_id, power)
+        where t._id = v._id
+    </update>
 </mapper>

+ 41 - 1
forecast-backend-server/src/main/resources/mybatis/power/DataShortTermPowerForecastRawMapper.xml

@@ -183,9 +183,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteDataShortTermPowerForecastRawByIds" parameterType="String">
-        delete from data_short_term_power_forecast_raw where _id in 
+        delete from data_short_term_power_forecast_raw where _id in
         <foreach item="Id" collection="array" open="(" separator="," close=")">
             #{Id}
         </foreach>
     </delete>
+
+    <!-- 批量新增(功率数据文件处理器): create_time 取当前epoch秒(列为INTEGER) -->
+    <insert id="batchInsertDataShortTermPowerForecastRaw" parameterType="java.util.List">
+        insert into data_short_term_power_forecast_raw (
+            latitude, longitude, data_org_type, data_type, business_process_type,
+            data_source, data_sourcegrab_id, data_sourcegrab_pattern_name,
+            data_model_id, data_model_name, source_id, source_name,
+            entity_id, entity_type, create_time, start_time, forecast_time,
+            pre_days, lead_time, station_id, station_name,
+            subject_id, subject_name, machine_id, machine_name,
+            analyze_his_id, archive_record_id, power
+        ) values
+        <foreach collection="list" item="item" separator=",">
+            (
+                #{item.latitude,jdbcType=VARCHAR}, #{item.longitude,jdbcType=VARCHAR},
+                #{item.dataOrgType}, #{item.dataType}, #{item.businessProcessType},
+                #{item.dataSource}, #{item.dataSourcegrabId}, #{item.dataSourcegrabPatternName},
+                #{item.dataModelId}, #{item.dataModelName}, #{item.sourceId}, #{item.sourceName},
+                #{item.entityId}, #{item.entityType}, EXTRACT(EPOCH FROM now())::INTEGER,
+                #{item.startTime}, #{item.forecastTime},
+                #{item.preDays}, #{item.leadTime}, #{item.stationId,jdbcType=BIGINT}, #{item.stationName,jdbcType=VARCHAR},
+                #{item.subjectId,jdbcType=INTEGER}, #{item.subjectName,jdbcType=VARCHAR},
+                #{item.machineId,jdbcType=VARCHAR}, #{item.machineName,jdbcType=VARCHAR},
+                #{item.analyzeHisId,jdbcType=INTEGER}, #{item.archiveRecordId,jdbcType=INTEGER},
+                #{item.power,jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
+
+    <!-- 批量修改(功率数据文件处理器): 按_id更新预测功率 -->
+    <update id="batchUpdateDataShortTermPowerForecastRaw" parameterType="java.util.List">
+        update data_short_term_power_forecast_raw as t
+        set power = v.power
+        from (values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.Id}::bigint, #{item.power,jdbcType=VARCHAR}::varchar)
+        </foreach>
+        ) as v(_id, power)
+        where t._id = v._id
+    </update>
 </mapper>

+ 41 - 1
forecast-backend-server/src/main/resources/mybatis/supershort/DataSuperShortTermForecastRawMapper.xml

@@ -188,9 +188,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteDataSuperShortTermForecastRawByIds" parameterType="String">
-        delete from data_super_short_term_forecast_raw where _id in 
+        delete from data_super_short_term_forecast_raw where _id in
         <foreach item="Id" collection="array" open="(" separator="," close=")">
             #{Id}
         </foreach>
     </delete>
+
+    <!-- 批量新增(功率数据文件处理器): create_time 取当前epoch秒(列为INTEGER) -->
+    <insert id="batchInsertDataSuperShortTermForecastRaw" parameterType="java.util.List">
+        insert into data_super_short_term_forecast_raw (
+            latitude, longitude, data_org_type, data_type, business_process_type,
+            data_source, data_sourcegrab_id, data_sourcegrab_pattern_name,
+            data_model_id, data_model_name, source_id, source_name,
+            entity_id, entity_type, create_time, start_time, forecast_time,
+            pre_days, lead_time, pre_qrts, station_id, station_name,
+            subject_id, subject_name, machine_id, machine_name,
+            analyze_his_id, archive_record_id, power
+        ) values
+        <foreach collection="list" item="item" separator=",">
+            (
+                #{item.latitude,jdbcType=VARCHAR}, #{item.longitude,jdbcType=VARCHAR},
+                #{item.dataOrgType}, #{item.dataType}, #{item.businessProcessType},
+                #{item.dataSource}, #{item.dataSourcegrabId}, #{item.dataSourcegrabPatternName},
+                #{item.dataModelId}, #{item.dataModelName}, #{item.sourceId}, #{item.sourceName},
+                #{item.entityId}, #{item.entityType}, EXTRACT(EPOCH FROM now())::INTEGER,
+                #{item.startTime}, #{item.forecastTime},
+                #{item.preDays}, #{item.leadTime}, #{item.preQrts}, #{item.stationId,jdbcType=BIGINT}, #{item.stationName,jdbcType=VARCHAR},
+                #{item.subjectId,jdbcType=INTEGER}, #{item.subjectName,jdbcType=VARCHAR},
+                #{item.machineId,jdbcType=VARCHAR}, #{item.machineName,jdbcType=VARCHAR},
+                #{item.analyzeHisId,jdbcType=INTEGER}, #{item.archiveRecordId,jdbcType=INTEGER},
+                #{item.power,jdbcType=VARCHAR}
+            )
+        </foreach>
+    </insert>
+
+    <!-- 批量修改(功率数据文件处理器): 按_id更新预测功率 -->
+    <update id="batchUpdateDataSuperShortTermForecastRaw" parameterType="java.util.List">
+        update data_super_short_term_forecast_raw as t
+        set power = v.power
+        from (values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.Id}::bigint, #{item.power,jdbcType=VARCHAR}::varchar)
+        </foreach>
+        ) as v(_id, power)
+        where t._id = v._id
+    </update>
 </mapper>