|
|
@@ -1,8 +1,7 @@
|
|
|
package com.jiayue.ipfcst.client.service.impl.an;
|
|
|
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-import com.jiayue.ipfcst.client.aop.WR;
|
|
|
import com.jiayue.ipfcst.client.dto.FileParsingConfig;
|
|
|
import com.jiayue.ipfcst.client.dto.ParsingConstant;
|
|
|
import com.jiayue.ipfcst.client.mapper.JiaYueWindPowerDqResultCoverMapper;
|
|
|
@@ -17,7 +16,6 @@ import com.jiayue.ipfcst.client.utils.FieldUtil;
|
|
|
import com.jiayue.ipfcst.client.utils.FileUtil;
|
|
|
import com.jiayue.ipfcst.client.utils.PUtil;
|
|
|
import com.jiayue.ipfcst.common.core.util.DateMomentUtil;
|
|
|
-import com.jiayue.ipp.common.data.entity.ForecastPowerShortTermHis;
|
|
|
import com.jiayue.ipp.common.data.entity.JiaYueWindPowerDqResultCover;
|
|
|
import com.jiayue.ipp.common.data.entity.an.ParsingDqInfo;
|
|
|
import com.jiayue.ipp.common.data.entity.an.ParsingInfo;
|
|
|
@@ -25,7 +23,6 @@ import com.jiayue.ipp.common.data.entity.an.ParsingUrl;
|
|
|
import com.jiayue.ipp.common.data.enums.FileTypeEnum;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.io.File;
|
|
|
@@ -55,8 +52,6 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
|
|
|
|
|
|
private final ElectricFieldService electricFieldService;
|
|
|
|
|
|
- private final ParsingDqInfoMapper parsingDqInfoMapper;
|
|
|
-
|
|
|
JiaYueWindPowerDqResultCoverMapper jiaYueWindPowerDqResultCoverMapper;
|
|
|
|
|
|
@Override
|
|
|
@@ -126,27 +121,11 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
|
|
|
Long forecastTime = parsingForecastTime(parsingDqInfo.getForecastTime(), fileContent);
|
|
|
|
|
|
if (forecastTime != 0l) {
|
|
|
- int ago = -1;
|
|
|
+
|
|
|
for (BigDecimal bigDecimal : bigDecimals) {
|
|
|
LocalDateTime localDateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(forecastTime), ZoneId.systemDefault());
|
|
|
forecastTime += Constant.INTERVALTIME;
|
|
|
-// int n = ago / 96;
|
|
|
-// if (n > 0) {
|
|
|
-// ForecastPowerShortTermHis forecastPowerShortTermHis = new ForecastPowerShortTermHis();
|
|
|
-// forecastPowerShortTermHis.setGenDate(genDate);
|
|
|
-// forecastPowerShortTermHis.setStationCode(parsingUrl.getStationCode());
|
|
|
-// forecastPowerShortTermHis.setAbleValue(bigDecimal);
|
|
|
-// forecastPowerShortTermHis.setForecastTime(localDateTime);
|
|
|
-// forecastPowerShortTermHis.setForecastHowLongAgo(n);
|
|
|
-// forecastPowerShortTermHis.setForecastManufactor(parsingUrl.getForecastManufactor());
|
|
|
-// forecastPowerShortTermHisList.add(forecastPowerShortTermHis);
|
|
|
-// }
|
|
|
- // LocalDate 转换为 Date
|
|
|
- ZoneId zone = ZoneId.systemDefault();
|
|
|
- Instant instant = genDate.atStartOfDay().atZone(zone).toInstant();
|
|
|
- Date da = Date.from(instant);
|
|
|
-
|
|
|
- // LocalDateTime转换为Date
|
|
|
+//
|
|
|
ZoneId zoneId = ZoneId.systemDefault();
|
|
|
ZonedDateTime zdt = localDateTime.atZone(zoneId);
|
|
|
Date date = Date.from(zdt.toInstant());
|
|
|
@@ -156,19 +135,15 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
|
|
|
// 将文件名中的时间转换为time格式
|
|
|
Time timeString = Time.valueOf(fileTime);
|
|
|
LocalDateTime combinedDateTime = DateMomentUtil.mergeDateAndTime(date, time);
|
|
|
+ // LocalDateTime转换为date格式
|
|
|
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ Date da = simpleDateFormat.parse(fileDate);
|
|
|
|
|
|
// 存入默认数据库(远端)
|
|
|
jiaYueWindPowerDqResultCoverList.add(this.jiaYueWindPowerDqResultCover(combinedDateTime, electricFieldService.numberToIdentification(parsingUrl.getStationCode()), bigDecimal.floatValue(),
|
|
|
new Date().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime(), da, timeString));
|
|
|
- ago++;
|
|
|
}
|
|
|
|
|
|
-// LocalDate today = LocalDate.now();
|
|
|
-// LambdaQueryWrapper<ForecastPowerShortTermHis> forecastPowerShortTermHisLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
-// forecastPowerShortTermHisLambdaQueryWrapper.eq(ForecastPowerShortTermHis::getStationCode, parsingUrl.getStationCode());
|
|
|
-// forecastPowerShortTermHisLambdaQueryWrapper.between(ForecastPowerShortTermHis::getGenDate, today.atStartOfDay(), today);
|
|
|
-// forecastPowerShortTermHisService.remove(forecastPowerShortTermHisLambdaQueryWrapper);
|
|
|
-// forecastPowerShortTermHisService.saveBatch(forecastPowerShortTermHisList);
|
|
|
jiaYueWindPowerDqResultCoverService.saveDq(jiaYueWindPowerDqResultCoverList, electricFieldService.numberToIdentification(parsingUrl.getStationCode()));
|
|
|
|
|
|
log.info("解析DQ文件：{} 成功！ O(∩_∩)O", file.getName());
|
|
|
@@ -200,10 +175,6 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
|
|
|
}
|
|
|
|
|
|
|
|
|
- private List<ParsingDqInfo> getParsingDqInfos(ParsingUrl parsingUrl) {
|
|
|
- return parsingDqInfoMapper.selectParsingDqInfo(parsingUrl.getStationCode());
|
|
|
- }
|
|
|
-
|
|
|
//目前所知该类型在文件中只有s一种形式==》暂不支持m
|
|
|
protected LocalDate parsingGenDate(String sign, List<String> fileContent) {
|
|
|
LocalDate genDate = LocalDate.now();
|
|
|
@@ -310,7 +281,8 @@ public class ParsingDqInfoServiceImpl extends ServiceImpl<ParsingDqInfoMapper, P
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 存入实体返回
|
|
|
+ * 存入实体返回
|
|
|
+ *
|
|
|
* @param localDateTime
|
|
|
* @param objId
|
|
|
* @param bigDecimal
|
fanxiaoyu