Skip to content

G
gf_back
Commit 798fef18 authored by ZWT's avatar ZWT
Browse files
Options

feat(能源管理系统): 邮件接收 

1.添加天气数据邮件方式接收定时任务;
2.修改配置文件,增加新建定时任务,同时增加自定义参数;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 72d36934
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 8 deletions
C10-task/pps-core-task/src/main/java/pps/core/task/job/WeatherReceiveJob.java 0 → 100644
View file @ 798fef18
package pps.core.task.job;
import xstartup.annotation.XService;
import xstartup.annotation.XText;
import xstartup.base.XContext;
import xstartup.base.XStartup;
import xstartup.base.tool.XLoggerTool;
import xstartup.data.XServiceResult;
import xstartup.service.job.XJob;
import xstartup.service.job.annotation.XCronTrigger;
/**
* 天气数据邮件接收定时任务
*
* @author ZWT
* @date 2023/11/13 17:15
*/
@XText("天气数据邮件接收定时任务")
@XService
public class WeatherReceiveJob implements XJob {
/**
* 每半小时执行
*
* @param xContext x上下文
* @return {@link XServiceResult}
*/
@XCronTrigger(value = XCronTrigger.PRE_5S)
@Override
public XServiceResult execute(XContext xContext) {
XLoggerTool logger = xContext.getLogger();
logger.info("------ WeatherReceiveJob start:{}", System.currentTimeMillis());
logger.info("------ WeatherReceiveJob end:{}", System.currentTimeMillis());
String property = XStartup.getCurrent().getProperty("weather.file.temp.path");
return XServiceResult.OK;
}
}
D03-deploy/deploy-pps-all/src/main/java/app/DeployPpsAllApplication.java
View file @ 798fef18
......@@ -35,6 +35,7 @@ public class DeployPpsAllApplication {
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeMidJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceCalibrationJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeShortJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(WeatherReceiveJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class));
//startup.enable(XCloudHuaweiCseFeature.class);
......
D03-deploy/deploy-pps-all/src/main/resources/deploy-pps-all.app.properties
View file @ 798fef18
......@@ -58,6 +58,7 @@ x.job.service=pps.core.task.job.TestJob,\
pps.core.task.job.SpaceOptimizeMidJob,\
pps.core.task.job.SpaceCalibrationJob,\
pps.core.task.job.SpaceOptimizeShortJob,\
pps.core.task.job.WeatherReceiveJob,\
pps.core.task.job.PlantPredictedPowerLongTermDataJob,\
pps.core.task.job.WeatherJob
......@@ -75,3 +76,6 @@ x.db.url=@x.db.url@
x.db.user=@x.db.user@
x.db.password=@x.db.password@
x.db.naming=@x.db.naming@
# \u81EA\u5B9A\u4E49\u914D\u7F6E
weather.file.temp.path=@weather.file.temp.path@
\ No newline at end of file
D03-deploy/deploy-pps-task/src/main/java/app/DeployPpsTaskApplication.java
View file @ 798fef18
......@@ -36,6 +36,7 @@ public class DeployPpsTaskApplication {
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeMidJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceCalibrationJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeShortJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(WeatherReceiveJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class));
startup.enable(XRpcFeature.class);
......
D03-deploy/deploy-pps-task/src/main/resources/deploy-pps-task.app.properties
View file @ 798fef18
......@@ -12,6 +12,7 @@ x.job.service=pps.core.task.job.TestJob,\
pps.core.task.job.SpaceOptimizeMidJob,\
pps.core.task.job.SpaceCalibrationJob,\
pps.core.task.job.SpaceOptimizeShortJob,\
pps.core.task.job.WeatherReceiveJob,\
pps.core.task.job.PlantPredictedPowerLongTermDataJob,\
pps.core.task.job.WeatherJob
......
D03-deploy/filters/filter-dev.properties
View file @ 798fef18
......@@ -142,3 +142,6 @@ spring.cloud.servicecomb.config.serverAddr=http://127.0.0.1:30110
spring.cloud.servicecomb.credentials.account.name=
spring.cloud.servicecomb.credentials.account.password=
spring.cloud.servicecomb.credentials.account.cipher=
# \u81EA\u5B9A\u4E49\u914D\u7F6E
weather.file.temp.path=D:\home\weather\temp\receive
\ No newline at end of file
D03-deploy/filters/filter-prod.properties
View file @ 798fef18
......@@ -16,7 +16,7 @@ x.server.port.third-interface=10094
x.server.port.report=10095
x.server.host=127.0.0.1
#自定义配置
#\u81EA\u5B9A\u4E49\u914D\u7F6E
pps.core.common.mq-config.accessLogMq=pps_base_sys_log
pps.core.common.mq-config.newToOldFormMq=pps_data_defined_from_new
pps.core.common.mq-config.oldToNewMq=pps_dispatch_rzd_from_old
......@@ -62,11 +62,11 @@ pps.core.iam.iam-config.responseType=code
pps.core.iam.iam-config.state=pipe
pps.core.common.analysis-transfer-config.useMq2Analysis=true
#ukey登录
#ukey\u767B\u5F55
pps.core.system.login-config.ukeyUrl=https://mfs-iam.pipechina.com.cn/verify_signature
pps.core.system.login-config.appid=j7Nx
#日志配置
#\u65E5\u5FD7\u914D\u7F6E
x.log.level=debug
x.log.directory=/home/pps/log
......@@ -230,3 +230,6 @@ spring.cloud.servicecomb.config.serverAddr=https://10.37.122.202:30103,https://1
spring.cloud.servicecomb.credentials.account.name=root
spring.cloud.servicecomb.credentials.account.password=Xzypt@1020
spring.cloud.servicecomb.credentials.account.cipher=default
# \u81EA\u5B9A\u4E49\u914D\u7F6E
weather.file.temp.path=/home/weather-jar/temp/receive
\ No newline at end of file
D03-deploy/filters/filter-test.properties
View file @ 798fef18
......@@ -16,10 +16,10 @@ x.server.port.third-interface=10094
x.server.port.report=10095
x.server.host=127.0.0.1
#自定义配置
#！！！！由于华为云平台调整， 开发（25-test）和测试（150-uat）环境共用一个mq ，故开发环境 使用的topic 添加dev_ 前缀 ！！！！
#！！！！由于华为云平台调整， 开发（25-test）和测试（150-uat）环境共用一个mq ，故开发环境 使用的topic 添加dev_ 前缀 ！！！！
#！！！！由于华为云平台调整， 开发（25-test）和测试（150-uat）环境共用一个mq ，故开发环境 使用的topic 添加dev_ 前缀 ！！！！
#\u81EA\u5B9A\u4E49\u914D\u7F6E
#\uFF01\uFF01\uFF01\uFF01\u7531\u4E8E\u534E\u4E3A\u4E91\u5E73\u53F0\u8C03\u6574\uFF0C \u5F00\u53D1\uFF0825-test\uFF09\u548C\u6D4B\u8BD5\uFF08150-uat\uFF09\u73AF\u5883\u5171\u7528\u4E00\u4E2Amq \uFF0C\u6545\u5F00\u53D1\u73AF\u5883 \u4F7F\u7528\u7684topic \u6DFB\u52A0dev_ \u524D\u7F00 \uFF01\uFF01\uFF01\uFF01
#\uFF01\uFF01\uFF01\uFF01\u7531\u4E8E\u534E\u4E3A\u4E91\u5E73\u53F0\u8C03\u6574\uFF0C \u5F00\u53D1\uFF0825-test\uFF09\u548C\u6D4B\u8BD5\uFF08150-uat\uFF09\u73AF\u5883\u5171\u7528\u4E00\u4E2Amq \uFF0C\u6545\u5F00\u53D1\u73AF\u5883 \u4F7F\u7528\u7684topic \u6DFB\u52A0dev_ \u524D\u7F00 \uFF01\uFF01\uFF01\uFF01
#\uFF01\uFF01\uFF01\uFF01\u7531\u4E8E\u534E\u4E3A\u4E91\u5E73\u53F0\u8C03\u6574\uFF0C \u5F00\u53D1\uFF0825-test\uFF09\u548C\u6D4B\u8BD5\uFF08150-uat\uFF09\u73AF\u5883\u5171\u7528\u4E00\u4E2Amq \uFF0C\u6545\u5F00\u53D1\u73AF\u5883 \u4F7F\u7528\u7684topic \u6DFB\u52A0dev_ \u524D\u7F00 \uFF01\uFF01\uFF01\uFF01
pps.core.common.mq-config.accessLogMq=dev_pps_base_sys_log
pps.core.common.mq-config.newToOldFormMq=dev_pps_data_defined_from_new
pps.core.common.mq-config.oldToNewMq=dev_pps_dispatch_rzd_from_old
......@@ -68,7 +68,7 @@ pps.core.measure.si-config.siUrl=http://10.20.89.75/interface/
pps.core.system.login-config.ukeyUrl=https://mfstest-iam.pipechina.com.cn/verify_signature
pps.core.system.login-config.appid=mEvc
#日志配置
#\u65E5\u5FD7\u914D\u7F6E
x.log.level=debug
x.log.directory=/home/pps/log
......@@ -231,3 +231,6 @@ spring.cloud.servicecomb.config.serverAddr=https://172.16.1.178:30103,https://17
spring.cloud.servicecomb.credentials.account.name=
spring.cloud.servicecomb.credentials.account.password=
spring.cloud.servicecomb.credentials.account.cipher=
# \u81EA\u5B9A\u4E49\u914D\u7F6E
weather.file.temp.path=/home/weather-jar/temp/receive
\ No newline at end of file
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