Commit 63078dda authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.邮件发送服务代码修改,修改配置文件及发送逻辑,解决邮件名称唯一性;
2.邮件接收功能修改,解决邮件接收协议修改后导致的一系列问题;
3.长期间开优化功能修改,修改定时任务处理逻辑及执行周期;
4.中期间开优化功能修改,修改定时任务处理逻辑及执行周期;
5.超长期间开优化功能开发,开发相关接口及定时任务,创建对应数据表,生成对应接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent affa3e82
......@@ -86,7 +86,7 @@ public class SpaceOptimizeUltraCloudServiceImpl extends SpaceOptimizeBaseService
.plantIds(relation.getPlantIdsByLineIdMap().get(detail.getLineId()))
.startTime(date.toString(BusinessConstant.DATE_FORMAT_DAY))
.endTime(optimizeDeadline.toString(BusinessConstant.DATE_FORMAT_DAY))
.dateType(BusinessConstant.TWO)
.dateType(BusinessConstant.ZERO)
.build());
break;
//离网型优化
......@@ -102,7 +102,7 @@ public class SpaceOptimizeUltraCloudServiceImpl extends SpaceOptimizeBaseService
.plantIds(relation.getPlantIdsByLineIdMap().get(detail.getLineId()))
.startTime(date.toString(BusinessConstant.DATE_FORMAT_DAY))
.endTime(optimizeDeadline.toString(BusinessConstant.DATE_FORMAT_DAY))
.dateType(BusinessConstant.TWO)
.dateType(BusinessConstant.ZERO)
.build());
break;
default:
......
......@@ -30,14 +30,6 @@ public interface PredictedPowerViewMapper {
*/
List<PredictedPowerView> selectShortPowerList(PredictedPowerView view);
/**
* 获取长期预测数据
*
* @param view 看法
* @return {@link List}<{@link PredictedPowerView}>
*/
List<PredictedPowerView> selectUltraPowerList(PredictedPowerView view);
/*-------------------------------------------------------------------------*/
/**
......@@ -55,12 +47,4 @@ public interface PredictedPowerViewMapper {
* @return {@link List}<{@link PredictedPowerView}>
*/
List<PredictedPowerView> selectShortPowerHourList(PredictedPowerView view);
/**
* 获取长期预测数据(小时)
*
* @param view 看法
* @return {@link List}<{@link PredictedPowerView}>
*/
List<PredictedPowerView> selectUltraPowerHourList(PredictedPowerView view);
}
......@@ -75,13 +75,6 @@ public class PlantPredictedPowerCloudServiceImpl implements IPlantPredictedPower
.endTime(endTime)
.build());
break;
case 2:
list = mapper.selectUltraPowerList(PredictedPowerView.builder()
.plantIds(plantIds)
.startTime(startTime)
.endTime(endTime)
.build());
break;
default:
}
}
......
......@@ -65,35 +65,6 @@
a.create_time
</select>
<select id="selectUltraPowerList" resultMap="BaseResultMap">
SELECT
IFNULL( AVG( a.predict_power ), 0 ) AS power,
a.create_time AS create_time
FROM
(
SELECT
predict_power,
DATE_FORMAT ( data_date, '%H:%i:%s' ) AS create_time
FROM
plant_predicted_power_long_term
WHERE
plant_id IN
<foreach collection="plantIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
<if test="startTime != null and endTime != null">
AND
data_date BETWEEN
#{startTime} AND
#{endTime}
</if>
) a
GROUP BY
a.create_time
ORDER BY
a.create_time
</select>
<!--*********************************************************************************-->
<select id="selectMidPowerHourList" resultMap="BaseResultMap">
......@@ -153,33 +124,4 @@
ORDER BY
a.create_time
</select>
<select id="selectUltraPowerHourList" resultMap="BaseResultMap">
SELECT
IFNULL( AVG( a.predict_power ), 0 ) AS power,
a.create_time AS hour_time
FROM
(
SELECT
predict_power,
HOUR( data_date ) AS create_time
FROM
plant_predicted_power_long_term
WHERE
plant_id IN
<foreach collection="plantIds" item="item" open="(" separator="," close=")">
#{item}
</foreach>
<if test="startTime != null and endTime != null">
AND
data_date BETWEEN
#{startTime} AND
#{endTime}
</if>
) a
GROUP BY
a.create_time
ORDER BY
a.create_time
</select>
</mapper>
\ 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