Commit e92ede97 authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.开发间开优化结果统计功能,创建间开优化效果统计表,生成对应代码;
2.修改15天,10天,3天,1天间开优化功能,修改代码结构;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent e59bdfff
......@@ -262,7 +262,7 @@ public class EasyExcelUtil {
}
excelReader.finish();
} catch (IOException e) {
throw new RuntimeException(e);
log.error("readExcelListener", e);
}
return excelListener;
}
......@@ -276,9 +276,10 @@ public class EasyExcelUtil {
EasyExcel.read(inputStream, clazz, excelListener).build();
inputStream.close();
return excelReader;
} catch (Exception e) {
throw new RuntimeException(e);
} catch (IOException e) {
log.error("getReader", e);
}
return null;
}
/**
......
......@@ -44,7 +44,7 @@ public class ManifestComponentInfoHelper {
log.error("ManifestComponentInfoHelper ", ignored);
}
}
} catch (Exception ignored) {
} catch (IOException ignored) {
log.error("ManifestComponentInfoHelper ", ignored);
}
}
......
package pps.core.base.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.text.CharSequenceUtil;
......@@ -20,7 +19,6 @@ import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.data.CustomQueryInput;
import xstartup.base.util.XCopyUtils;
import xstartup.base.util.XHttpUtils;
import xstartup.base.util.XJsonUtils;
import xstartup.data.XListResult;
import xstartup.data.XPageResult;
......@@ -31,8 +29,10 @@ import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost;
import xstartup.feature.mybatis.helper.XMapperHelper;
import java.math.BigDecimal;
import java.util.*;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@XService
public class BaseDataService {
......@@ -113,13 +113,6 @@ public class BaseDataService {
}
List<BaseDataEnt> list = mapper.selectList(queryWrapper);
CalcBaseDataInput calcBaseDataInput = new CalcBaseDataInput("", input.getKeyName(), input.getLineId(), "train_pre", DateUtil.formatDateTime(beginTime), DateUtil.formatDateTime(endTime));
Map<String, Object> map = getCalcData(context, calcBaseDataInput);
list.forEach(item -> {
String dataDate = DateUtil.formatDateTime(item.getDataDate());
if (map.containsKey(dataDate)) {
item.setPredictedPower(new BigDecimal(map.get(dataDate).toString()));
}
});
return XListResult.success(XCopyUtils.copyNewList(list, QueryBaseDataOutput.class));
}
......@@ -159,13 +152,6 @@ public class BaseDataService {
.le(BaseDataEnt::getDataDate, ent.getEndDate())
.eq(BaseDataEnt::getLineId, input.getLineId())
.orderByAsc(BaseDataEnt::getDataDate));
Map<String, Object> map = getCalcData(context, new CalcBaseDataInput("", input.getKeyName(), input.getLineId(), "train_pre", DateUtil.formatDateTime(ent.getBeginDate()), DateUtil.formatDateTime(ent.getEndDate())));
list.forEach(item -> {
String dataDate = DateUtil.formatDateTime(item.getDataDate());
if (map.containsKey(dataDate)) {
item.setPredictedPower(new BigDecimal(map.get(dataDate).toString()));
}
});
outputs = XCopyUtils.copyNewList(list, GetBaseDataOutput.class);
}
return XListResult.success(outputs);
......@@ -190,51 +176,12 @@ public class BaseDataService {
@XText("获取预算")
@XApiGet
public XServiceResult calcBaseData(XContext context, CalcBaseDataInput calcBaseDataInput) {
getCalcData(context, calcBaseDataInput);
return XServiceResult.OK;
}
public Map<String, Object> getCalcData(XContext context, CalcBaseDataInput calcBaseDataInput) {
Map<String, Object> returnMap = new HashMap<>();
try {
String jsonString = XJsonUtils.toJson(calcBaseDataInput);
context.getLogger().info(jsonString);
String result = XHttpUtils.postAsJson("http://121.36.43.217:8098/model/predict", jsonString, 10000);
returnMap = XJsonUtils.toMap(result);
return returnMap;
} catch (Exception e) {
return returnMap;
}
}
public void doTrainData(CalcBaseDataInput calcBaseDataInput) {
try {
String jsonString = XJsonUtils.toJson(calcBaseDataInput);
XHttpUtils.postAsJson("http://121.36.43.217:8098/model/train", jsonString, 10000);
} catch (Exception e) {
throw new RuntimeException("调用预测接口失败");
}
}
@XApiPost
@XText("预测算法训练")
public XServiceResult trainBaseData(XContext context, TrainBaseModelValInput input) {
BaseDataImportLogMapper logMapper = context.getBean(BaseDataImportLogMapper.class);
BaseDataImportLogEnt ent = logMapper.selectOne(new LambdaQueryWrapper<BaseDataImportLogEnt>()
.eq(BaseDataImportLogEnt::getLineId, input.getLineId())
.orderByDesc(BaseDataImportLogEnt::getCreateTime)
.last(BusinessConstant.LAST_LIMIT));
if (ObjectUtil.isNull(ent))
return XServiceResult.OK;
if (CollUtil.isNotEmpty(input.getKeyNames())) {
for (String keyName : input.getKeyNames()) {
CalcBaseDataInput calcBaseDataInput = new CalcBaseDataInput("", keyName, input.getLineId(), "train_val", DateUtil.formatDateTime(ent.getBeginDate()), DateUtil.formatDateTime(ent.getEndDate()));
doTrainData(calcBaseDataInput);
}
} else {
CalcBaseDataInput calcBaseDataInput = new CalcBaseDataInput("", input.getKeyName(), input.getLineId(), "train_val", DateUtil.formatDateTime(ent.getBeginDate()), DateUtil.formatDateTime(ent.getEndDate()));
doTrainData(calcBaseDataInput);
}
return XServiceResult.OK;
}
......
......@@ -37,6 +37,7 @@ import pps.core.system.mapper.SysOrganizationViewMapper;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.base.util.XCopyUtils;
import xstartup.base.util.XJsonUtils;
import xstartup.data.XListResult;
......@@ -413,7 +414,7 @@ public class BasePhotovoltaicPlantService {
break;
}
}
} catch (Exception e) {
} catch (XServiceException e) {
context.getLogger().error(e);
}
return result;
......
......@@ -612,7 +612,7 @@ public class ExcelService {
} else {
excelPriceStrategyTemplate.setEnd(DateTime.of(excelPriceStrategyTemplate.getEndTime(), BusinessConstant.MINUTES_FORMAT));
}
} catch (Exception e) {
} catch (XServiceException e) {
errorRowList.add(rowNum);
}
excelPriceStrategyTemplate.setRowNum(rowNum++);
......
......@@ -9,6 +9,7 @@ import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
/**
......@@ -37,7 +38,7 @@ public class DailyElectricityTrendJob {
IDailyElectricityTrendCloudService service = xContext.getBean(IDailyElectricityTrendCloudService.class);
XServiceResult result = service.dailyElectricityTrendJob(xContext);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ DailyElectricityTrendJob Exception: ", e);
} finally {
xContext.getLogger().info("------ DailyElectricityTrendJob end:{}", DateUtil.date());
......
......@@ -9,6 +9,7 @@ import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
/**
......@@ -37,7 +38,7 @@ public class EnergyConsumptionAnalysisJob {
IThirdDataAccessCloudService service = xContext.getBean(IThirdDataAccessCloudService.class);
XServiceResult result = service.energyConsumptionAnalysisJob(xContext);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ EnergyConsumptionAnalysisJob Exception: ", e);
} finally {
xContext.getLogger().info("------ EnergyConsumptionAnalysisJob end:{}", DateUtil.date());
......
......@@ -34,20 +34,10 @@ public class PhotovoltaicTrainJob {
TaskLockCache exist = TaskLockCache.exist(xContext, redisFlag);
if (ObjectUtil.isNull(exist)) {
ServiceUtil.setCache(xContext, redisFlag);
try {
XThreadHelper.async(() -> {
try {
HttpUtil.get("http://127.0.0.1:10060/api/photovoltaic/train?secretKey=fZ1kC1aV8bO7rH3bL8oE5zI0mY3vW1sG");
} catch (Exception e) {
xContext.getLogger().error("---- train", e);
}
});
} catch (Exception e) {
xContext.getLogger().error("------ PhotovoltaicTrainJob Exception: ", e);
} finally {
xContext.getLogger().info("------ PhotovoltaicTrainJob end:{}", DateUtil.date());
TaskLockCache.delete(xContext, redisFlag);
}
XThreadHelper.async(() -> {
HttpUtil.get("http://127.0.0.1:10060/api/photovoltaic/train?secretKey=fZ1kC1aV8bO7rH3bL8oE5zI0mY3vW1sG");
});
TaskLockCache.delete(xContext, redisFlag);
}
return XServiceResult.OK;
}
......
......@@ -9,6 +9,7 @@ import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
import xstartup.service.job.XJob;
import xstartup.service.job.annotation.XCronTrigger;
......@@ -41,7 +42,7 @@ public class SpaceCalibrationJob implements XJob {
ISpaceCalibrationCloudService service = xContext.getBean(ISpaceCalibrationCloudService.class);
XServiceResult result = service.calibrateJob(xContext);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ SpaceCalibrationJob Exception: ", e);
} finally {
xContext.getLogger().info("------ SpaceCalibrationJob end:{}", DateUtil.date());
......
......@@ -9,6 +9,7 @@ import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
import xstartup.service.job.XJob;
import xstartup.service.job.annotation.XCronTrigger;
......@@ -41,7 +42,7 @@ public class SpaceOptimizeLongJob implements XJob {
ISpaceOptimizeLongCloudService service = xContext.getBean(ISpaceOptimizeLongCloudService.class);
XServiceResult result = service.optimizeLongJob(xContext);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ SpaceOptimizeLongJob Exception: ", e);
} finally {
xContext.getLogger().info("------ SpaceOptimizeLongJob end:{}", DateUtil.date());
......
......@@ -9,6 +9,7 @@ import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
import xstartup.service.job.XJob;
import xstartup.service.job.annotation.XCronTrigger;
......@@ -41,7 +42,7 @@ public class SpaceOptimizeMidJob implements XJob {
ISpaceOptimizeMidCloudService service = xContext.getBean(ISpaceOptimizeMidCloudService.class);
XServiceResult result = service.optimizeMidJob(xContext);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ SpaceOptimizeMidJob Exception: ", e);
} finally {
xContext.getLogger().info("------ SpaceOptimizeMidJob end:{}", DateUtil.date());
......
......@@ -9,6 +9,7 @@ import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
import xstartup.service.job.XJob;
import xstartup.service.job.annotation.XCronTrigger;
......@@ -41,7 +42,7 @@ public class SpaceOptimizeShortJob implements XJob {
ISpaceOptimizeShortCloudService service = xContext.getBean(ISpaceOptimizeShortCloudService.class);
XServiceResult result = service.optimizeShortJob(xContext);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ SpaceOptimizeShortJob Exception: ", e);
} finally {
xContext.getLogger().info("------ SpaceOptimizeShortJob end:{}", DateUtil.date());
......
......@@ -9,6 +9,7 @@ import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
import xstartup.service.job.XJob;
import xstartup.service.job.annotation.XCronTrigger;
......@@ -41,8 +42,8 @@ public class SpaceOptimizeUltraJob implements XJob {
ISpaceOptimizeUltraCloudService service = xContext.getBean(ISpaceOptimizeUltraCloudService.class);
XServiceResult result = service.optimizeUltraJob(xContext);
result.throwIfFail();
} catch (Exception e) {
xContext.getLogger().error("------ SpaceOptimizeUltraJob Exception: ", e);
} catch (XServiceException e) {
xContext.getLogger().error("------ SpaceOptimizeUltraJob RuntimeException: ", e);
} finally {
xContext.getLogger().info("------ SpaceOptimizeUltraJob end:{}", DateUtil.date());
TaskLockCache.delete(xContext, redisFlag);
......
......@@ -8,6 +8,7 @@ import pps.core.task.constant.TaskConstant;
import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
/**
......@@ -35,7 +36,7 @@ public class StationDailyProductionSituationJob {
IStationDailyCloudService service = xContext.getBean(IStationDailyCloudService.class);
XServiceResult result = service.stationDailyJob(xContext);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ StationDailyProductionSituationJob Exception: ", e);
} finally {
xContext.getLogger().info("------ StationDailyProductionSituationJob end:{}", DateUtil.date());
......
......@@ -8,6 +8,7 @@ import pps.core.task.constant.TaskConstant;
import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
/**
......@@ -36,7 +37,7 @@ public class ThirdActivePowerJob {
IThirdDataAccessCloudService service = xContext.getBean(IThirdDataAccessCloudService.class);
XServiceResult result = service.thirdActivePowerJob(xContext);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ ThirdActivePowerJob Exception: ", e);
} finally {
xContext.getLogger().info("------ ThirdActivePowerJob end:{}", DateUtil.date());
......
......@@ -8,6 +8,7 @@ import pps.core.task.constant.TaskConstant;
import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
/**
......@@ -36,7 +37,7 @@ public class ThirdCurrentWellConditionJob {
IThirdDataAccessCloudService service = xContext.getBean(IThirdDataAccessCloudService.class);
XServiceResult result = service.thirdCurrentWellConditionJob(xContext);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ ThirdCurrentWellConditionJob Exception: ", e);
} finally {
xContext.getLogger().info("------ ThirdCurrentWellConditionJob end:{}", DateUtil.date());
......
......@@ -8,6 +8,7 @@ import pps.core.task.constant.TaskConstant;
import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
/**
......@@ -36,7 +37,7 @@ public class ThirdDailyAccumulationJob {
IThirdDataAccessCloudService service = xContext.getBean(IThirdDataAccessCloudService.class);
XServiceResult result = service.thirdDailyAccumulationJob(xContext);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ ThirdDailyAccumulationJob Exception: ", e);
} finally {
xContext.getLogger().info("------ ThirdDailyAccumulationJob end:{}", DateUtil.date());
......
......@@ -8,6 +8,7 @@ import pps.core.task.constant.TaskConstant;
import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
/**
......@@ -36,7 +37,7 @@ public class ThirdPhotovoltaicPowerJob {
IThirdDataAccessCloudService service = xContext.getBean(IThirdDataAccessCloudService.class);
XServiceResult result = service.thirdPhotovoltaicPowerJob(xContext);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ ThirdPhotovoltaicPowerJob Exception: ", e);
} finally {
xContext.getLogger().info("------ ThirdPhotovoltaicPowerJob end:{}", DateUtil.date());
......
......@@ -8,6 +8,7 @@ import pps.core.task.constant.TaskConstant;
import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
/**
......@@ -36,7 +37,7 @@ public class ThirdWellAvgActivePowerJob {
IThirdDataAccessCloudService service = xContext.getBean(IThirdDataAccessCloudService.class);
XServiceResult result = service.thirdWellAvgActivePowerJob(xContext);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ ThirdWellAvgActivePowerJob Exception: ", e);
} finally {
xContext.getLogger().info("------ ThirdWellAvgActivePowerJob end:{}", DateUtil.date());
......
......@@ -8,6 +8,7 @@ import pps.core.task.constant.TaskConstant;
import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
/**
......@@ -36,7 +37,7 @@ public class WeatherReceiveJob {
IBaseWeatherCloudService service = xContext.getBean(IBaseWeatherCloudService.class);
XServiceResult result = service.weatherDataProcess(xContext, oilFieldCode);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ WeatherReceiveJob Exception: ", e);
} finally {
xContext.getLogger().info("------ WeatherReceiveJob end:{}", DateUtil.date());
......
......@@ -8,6 +8,7 @@ import pps.core.task.constant.TaskConstant;
import pps.core.task.utils.ServiceUtil;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.exception.XServiceException;
import xstartup.data.XServiceResult;
/**
......@@ -36,7 +37,7 @@ public class WellTechDailyJob {
IPlantPredictedPowerCloudService service = xContext.getBean(IPlantPredictedPowerCloudService.class);
XServiceResult result = service.wellTechDailyJob(xContext);
result.throwIfFail();
} catch (Exception e) {
} catch (XServiceException e) {
xContext.getLogger().error("------ WellTechDailyJob Exception: ", e);
} finally {
xContext.getLogger().info("------ WellTechDailyJob end:{}", DateUtil.date());
......
......@@ -93,7 +93,7 @@ public class ExcelService {
template.setEnd(DateTime.of(template.getEndTime(), BusinessConstant.MINUTES_FORMAT));
}
template.setDuration(DateUtil.between(template.getStart(), template.getEnd(), DateUnit.MINUTE));
} catch (Exception e) {
} catch (XServiceException e) {
errorRowList.add(rowNum);
}
template.setRowNum(rowNum++);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment