feat(吉林演示): 松原

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

BREAKING CHANGE: 无

Closes 无

[skip ci]

C10-task/pps-core-task/src/main/java/pps/core/task/job/ThirdWindPowerGenerationJob.java

@@ -10,8 +10,6 @@ import xstartup.annotation.XService;
 import xstartup.annotation.XText;
 import xstartup.base.XContext;
 import xstartup.data.XServiceResult;
-import xstartup.service.job.XJob;
-import xstartup.service.job.annotation.XCronTrigger;
 
 /**
  * 第三方风力发电数据定时任务
@@ -22,7 +20,7 @@ import xstartup.service.job.annotation.XCronTrigger;
  */
 @XText("第三方风力发电数据定时任务")
 @XService
-public class ThirdWindPowerGenerationJob implements XJob {
+public class ThirdWindPowerGenerationJob {
 
     /**
      * 每半小时执行
@@ -30,8 +28,6 @@ public class ThirdWindPowerGenerationJob implements XJob {
      * @param xContext x上下文
      * @return {@link XServiceResult }
      */
-    @XCronTrigger(value = TaskConstant.HALF_HOUR_31)
-    @Override
     public XServiceResult execute(XContext xContext) {
         xContext.getLogger().info("------ ThirdWindPowerGenerationJob start:{}", DateUtil.date());
         String key = TaskConstant.TASK_LOCK_KEY + "ThirdWindPowerGenerationJob";

D03-deploy/deploy-pps-all/src/main/java/app/DeployPpsAllApplication.java

@@ -47,7 +47,6 @@ public class DeployPpsAllApplication {
         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(WindPredictionHistoryJob.class));
-        startup.enable(XJobFeature.class).config(new XJobServiceConf(ThirdWindPowerGenerationJob.class));
         startup.run(args);
     }
 }

D03-deploy/deploy-pps-all/src/main/resources/deploy-pps-all.app.properties

@@ -18,7 +18,6 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\
   pps.core.task.job.SpaceOptimizeShortJob,\
   pps.core.task.job.SpaceOptimizeUltraJob,\
   pps.core.task.job.WindPredictionHistoryJob,\
-  pps.core.task.job.ThirdWindPowerGenerationJob,\
   pps.core.task.job.PlantPredictedPowerLongTermDataJob
 # redis
 x.cache.type=@x.cache.type@