chore(gitignore): 修改并统一.gitignore规则
- 删除了.gitignore文件开头多余的空白行 - 将忽略规则中的所有前缀由负向规则改为正向规则(-改为+) - 新增对CLAUDE.md文件的忽略规则 - 调整并统一不同IDE和系统相关忽略规则格式 - 删除不必要的缩进,增强可读性
This commit is contained in:
parent
21cfc6020c
commit
1a296f0487
@ -16,6 +16,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
|
import org.springframework.util.ObjectUtils;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
@ -54,9 +55,9 @@ public class DnerDailyPowerOutageEventSyncServiceImpl extends ServiceImpl<DnerDa
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Boolean syncDnerDailyPowerOutageEvent(Long eventId) {
|
public Boolean syncDnerDailyPowerOutageEvent(Long eventId) {
|
||||||
String startDate = getStartDate(eventId);
|
/* String startDate = getStartDate(eventId);
|
||||||
String endDate = getEndDate(eventId);
|
String endDate = getEndDate(eventId);*/
|
||||||
return processingData(startDate, endDate, eventId);
|
return processingData(null, null, eventId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getEndDate(Long eventId) {
|
private String getEndDate(Long eventId) {
|
||||||
@ -80,6 +81,11 @@ public class DnerDailyPowerOutageEventSyncServiceImpl extends ServiceImpl<DnerDa
|
|||||||
public Boolean processingData(String startDate, String endDate, Long eventId) {
|
public Boolean processingData(String startDate, String endDate, Long eventId) {
|
||||||
log.info("================== 开始日K线停电事件同步任务 ==================");
|
log.info("================== 开始日K线停电事件同步任务 ==================");
|
||||||
Assert.notNull(eventId, "事件ID字段不能为空");
|
Assert.notNull(eventId, "事件ID字段不能为空");
|
||||||
|
Long count = hourlyPowerOutageEventMapper.selectCount(new LambdaQueryWrapper<>());
|
||||||
|
if (ObjectUtils.isEmpty(count) || count == 0) {
|
||||||
|
log.info("同步日K数据,分时表数据为空");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
if (!StringUtils.hasLength(startDate)) {
|
if (!StringUtils.hasLength(startDate)) {
|
||||||
startDate = getStartDate(eventId);
|
startDate = getStartDate(eventId);
|
||||||
}
|
}
|
||||||
@ -90,6 +96,8 @@ public class DnerDailyPowerOutageEventSyncServiceImpl extends ServiceImpl<DnerDa
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
log.info("开始日期: {}, 结束日期: {}", startDate, endDate);
|
log.info("开始日期: {}, 结束日期: {}", startDate, endDate);
|
||||||
|
Assert.hasLength(startDate, "开始日期为空");
|
||||||
|
Assert.hasLength(endDate, "结束日期为空");
|
||||||
|
|
||||||
List<String> allDates = getAllDates(startDate, endDate);
|
List<String> allDates = getAllDates(startDate, endDate);
|
||||||
if (CollectionUtils.isEmpty(allDates)) {
|
if (CollectionUtils.isEmpty(allDates)) {
|
||||||
|
|||||||
@ -67,7 +67,7 @@ public class HourlyOutageExcelProcessService {
|
|||||||
if (rowContexts.isEmpty()) {
|
if (rowContexts.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
log.info("需要处理数据数量:{}",districtTimeRangeMap.size());
|
||||||
// 3.2 按区县分批 IN 查询气象数据,并建立区县+时次索引
|
// 3.2 按区县分批 IN 查询气象数据,并建立区县+时次索引
|
||||||
Map<String, NavigableMap<LocalDateTime, RegionalWeatherData>> weatherIndex = loadWeatherIndexByDistrict(districtTimeRangeMap);
|
Map<String, NavigableMap<LocalDateTime, RegionalWeatherData>> weatherIndex = loadWeatherIndexByDistrict(districtTimeRangeMap);
|
||||||
|
|
||||||
@ -267,12 +267,16 @@ public class HourlyOutageExcelProcessService {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String startDate = formatToHourStart(batchMinStart);
|
||||||
|
String endDate = formatToHourStart(batchMaxEnd);
|
||||||
// 批量拉取该批区县在时间窗内的气象数据
|
// 批量拉取该批区县在时间窗内的气象数据
|
||||||
List<RegionalWeatherData> weatherDataList = regionalWeatherDataMapper.selectByOrgCodesAndTimeRange(
|
List<RegionalWeatherData> weatherDataList = regionalWeatherDataMapper.selectByOrgCodesAndTimeRange(
|
||||||
new ArrayList<>(batchCodes),
|
new ArrayList<>(batchCodes),
|
||||||
formatToHourStart(batchMinStart),
|
startDate,
|
||||||
formatToHourStart(batchMaxEnd));
|
endDate);
|
||||||
|
if (!weatherDataList.isEmpty()) {
|
||||||
|
log.error("xxxxxxxx");
|
||||||
|
}
|
||||||
for (RegionalWeatherData weatherData : weatherDataList) {
|
for (RegionalWeatherData weatherData : weatherDataList) {
|
||||||
String orgCode = weatherData.getOrgCode();
|
String orgCode = weatherData.getOrgCode();
|
||||||
TimeRange districtRange = districtTimeRangeMap.get(orgCode);
|
TimeRange districtRange = districtTimeRangeMap.get(orgCode);
|
||||||
|
|||||||
@ -190,7 +190,9 @@ public class RegionalWeatherDataSyncService extends ServiceImpl<RegionalWeatherD
|
|||||||
config.getWeatherProvince(),
|
config.getWeatherProvince(),
|
||||||
config.getWeatherCity(),
|
config.getWeatherCity(),
|
||||||
config.getWeatherDistrict()),
|
config.getWeatherDistrict()),
|
||||||
WeatherSiteAreaConfiguration::getDistrictCode,
|
config -> config.getDistrictCode().length() > 6
|
||||||
|
? config.getDistrictCode().substring(0, 6)
|
||||||
|
: config.getDistrictCode(),
|
||||||
(oldValue, newValue) -> oldValue));
|
(oldValue, newValue) -> oldValue));
|
||||||
|
|
||||||
// 全部放入你的成员变量 Map
|
// 全部放入你的成员变量 Map
|
||||||
|
|||||||
@ -92,7 +92,7 @@ public class AreaConfigUtil {
|
|||||||
nwAreaMap.put(key, cfg.getDistrictCode());
|
nwAreaMap.put(key, cfg.getDistrictCode());
|
||||||
}
|
}
|
||||||
nwAreaMapThreadLocal.set(nwAreaMap);
|
nwAreaMapThreadLocal.set(nwAreaMap);
|
||||||
log.debug("南网区划配置加载完成,共 {} 条", nwAreaMap.size());
|
log.info("南网区划配置加载完成,共 {} 条", nwAreaMap.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -112,10 +112,12 @@ public class AreaConfigUtil {
|
|||||||
|
|
||||||
Map<String, List<WeatherSiteAreaConfiguration>> weatherAreaMap = new HashMap<>((int)(list.size() / 0.75) + 1);
|
Map<String, List<WeatherSiteAreaConfiguration>> weatherAreaMap = new HashMap<>((int)(list.size() / 0.75) + 1);
|
||||||
for (WeatherSiteAreaConfiguration cfg : list) {
|
for (WeatherSiteAreaConfiguration cfg : list) {
|
||||||
weatherAreaMap.computeIfAbsent(cfg.getDistrictCode(), k -> new ArrayList<>()).add(cfg);
|
String districtCode = cfg.getDistrictCode();
|
||||||
|
String key = districtCode.length() > 6 ? districtCode.substring(0, 6) : districtCode;
|
||||||
|
weatherAreaMap.computeIfAbsent(key, k -> new ArrayList<>()).add(cfg);
|
||||||
}
|
}
|
||||||
weatherAreaMapThreadLocal.set(weatherAreaMap);
|
weatherAreaMapThreadLocal.set(weatherAreaMap);
|
||||||
log.debug("气象区划配置加载完成,共 {} 条", weatherAreaMap.size());
|
log.info("气象区划配置加载完成,共 {} 条", weatherAreaMap.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user