Commit 709ab82b authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.邮件发送服务代码修改,修改配置文件及发送逻辑,解决邮件名称唯一性;
2.邮件接收功能修改,解决邮件接收协议修改后导致的一系列问题;
3.长期间开优化功能修改,修改定时任务处理逻辑及执行周期;
4.中期间开优化功能修改,修改定时任务处理逻辑及执行周期;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 6e76e4d0
...@@ -57,7 +57,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower ...@@ -57,7 +57,7 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
String startTime = input.getStartTime(); String startTime = input.getStartTime();
String endTime = input.getEndTime(); String endTime = input.getEndTime();
Integer dateType = input.getDateType(); Integer dateType = input.getDateType();
List list = null; List<PredictedPowerView> list = null;
if (CollUtil.isNotEmpty(plantIds)) { if (CollUtil.isNotEmpty(plantIds)) {
PredictedPowerViewMapper mapper = context.getBean(PredictedPowerViewMapper.class); PredictedPowerViewMapper mapper = context.getBean(PredictedPowerViewMapper.class);
switch (dateType) { switch (dateType) {
......
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
<mapper namespace="pps.core.prediction.mapper.PredictedPowerViewMapper"> <mapper namespace="pps.core.prediction.mapper.PredictedPowerViewMapper">
<resultMap id="BaseResultMap" type="pps.core.prediction.entity.PredictedPowerView"> <resultMap id="BaseResultMap" type="pps.core.prediction.entity.PredictedPowerView">
<result column="power" property="power" jdbcType="DECIMAL"/> <result column="power" property="power" jdbcType="DECIMAL"/>
<result column="create_time" property="createTime" jdbcType="DATE"/> <result column="create_time" property="createTime" jdbcType="VARCHAR"/>
<result column="hour_time" property="hourTime" jdbcType="VARCHAR"/> <result column="hour_time" property="hourTime" jdbcType="VARCHAR"/>
</resultMap> </resultMap>
<select id="selectMidPowerList" resultMap="BaseResultMap"> <select id="selectMidPowerList" resultMap="BaseResultMap">
SELECT SELECT
IFNULL( AVG( a.predict_power ), 0 ) AS power, IFNULL( AVG( a.predict_power ), 0 ) AS power,
a.create_time a.create_time AS create_time
FROM FROM
( (
SELECT SELECT
predict_power, predict_power,
TIME( data_date ) AS create_time DATE_FORMAT ( data_date, '%H:%i:%s' ) AS create_time
FROM FROM
plant_predicted_power_mid_term plant_predicted_power_mid_term
WHERE WHERE
...@@ -39,12 +39,12 @@ ...@@ -39,12 +39,12 @@
<select id="selectShortPowerList" resultMap="BaseResultMap"> <select id="selectShortPowerList" resultMap="BaseResultMap">
SELECT SELECT
IFNULL( AVG( a.predict_power ), 0 ) AS power, IFNULL( AVG( a.predict_power ), 0 ) AS power,
a.create_time a.create_time AS create_time
FROM FROM
( (
SELECT SELECT
predict_power, predict_power,
TIME( data_date ) AS create_time DATE_FORMAT ( data_date, '%H:%i:%s' ) AS create_time
FROM FROM
plant_predicted_power_short_term plant_predicted_power_short_term
WHERE WHERE
......
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