Commit c66113b8 authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.天气数据接收定时任务,解决代码扫描问题,修改文件读取相关代码,解决资源未关流问题;
2.修改登录验证码生成工具类,解决代码扫描问题,修复随机数不安全问题;
3.删除除主程序启动类外其他启动类模块,解决代码扫描问题;
4.删除自定义httputlis类,解决代码扫描问题,替换部分代码远程调用方法;
5.重构光伏预测模块下载电站实际发电数据导入模板接口,解决代码扫描问题;
6.重构光伏预测模块导入电站实际发电数据接口,解决代码扫描问题;
7.删除公用excel导入导出工具类及poi相关pom依赖,解决代码扫描问题;
8.光伏功率预测模块,增加查询线路列表接口,解决页面接口报错问题;
9.增加测试用历史数据导入接口;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 2a3794c9
...@@ -10,8 +10,6 @@ import xstartup.annotation.XService; ...@@ -10,8 +10,6 @@ import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
import xstartup.service.job.XJob;
import xstartup.service.job.annotation.XCronTrigger;
/** /**
* 风资源训练集数据定时任务 * 风资源训练集数据定时任务
...@@ -21,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger; ...@@ -21,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger;
*/ */
@XText("风资源训练集数据定时任务") @XText("风资源训练集数据定时任务")
@XService @XService
public class WindPredictionHistoryJob implements XJob { public class WindPredictionHistoryJob {
/** /**
* 每天00:12执行 * 每天00:12执行
...@@ -29,8 +27,6 @@ public class WindPredictionHistoryJob implements XJob { ...@@ -29,8 +27,6 @@ public class WindPredictionHistoryJob implements XJob {
* @param xContext x上下文 * @param xContext x上下文
* @return {@link XServiceResult } * @return {@link XServiceResult }
*/ */
@XCronTrigger(value = TaskConstant.EVERY_DAY_12)
@Override
public XServiceResult execute(XContext xContext) { public XServiceResult execute(XContext xContext) {
xContext.getLogger().info("------ WindPredictionHistoryJob start:{}", DateUtil.date()); xContext.getLogger().info("------ WindPredictionHistoryJob start:{}", DateUtil.date());
String key = TaskConstant.TASK_LOCK_KEY + "WindPredictionHistoryJob"; String key = TaskConstant.TASK_LOCK_KEY + "WindPredictionHistoryJob";
......
...@@ -46,7 +46,6 @@ public class DeployPpsAllApplication { ...@@ -46,7 +46,6 @@ public class DeployPpsAllApplication {
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeUltraJob.class)); startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeUltraJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeShortJob.class)); startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeShortJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class)); startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(WindPredictionHistoryJob.class));
startup.run(args); startup.run(args);
} }
} }
...@@ -17,7 +17,6 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\ ...@@ -17,7 +17,6 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\
pps.core.task.job.SpaceCalibrationJob,\ pps.core.task.job.SpaceCalibrationJob,\
pps.core.task.job.SpaceOptimizeShortJob,\ pps.core.task.job.SpaceOptimizeShortJob,\
pps.core.task.job.SpaceOptimizeUltraJob,\ pps.core.task.job.SpaceOptimizeUltraJob,\
pps.core.task.job.WindPredictionHistoryJob,\
pps.core.task.job.PlantPredictedPowerLongTermDataJob pps.core.task.job.PlantPredictedPowerLongTermDataJob
# redis # redis
x.cache.type=@x.cache.type@ x.cache.type=@x.cache.type@
......
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