Commit 777c802a authored by ZWT's avatar ZWT

feat(能源管理系统): 修改架构

1.修改架构添加nacos;
2.修改间开模块启动程序,使其能独立启动并注册到nacos;
3.修改光伏预测模块启动程序,使其能独立启动并注册到nacos;
4.修改系统用户模块启动程序,使其能独立启动并注册到nacos;
5.修改定时任务模块启动程序,使其能独立启动并注册到nacos;
6.添加基础信息配置模块启动程序,使其能独立启动并注册到nacos;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent d0983d84
...@@ -128,7 +128,7 @@ public class BusinessConstant { ...@@ -128,7 +128,7 @@ public class BusinessConstant {
/** /**
* 日期标志 * 日期标志
*/ */
public static final DateTime DATE_FLAG = DateUtil.parse("1970-01-02 00:00:00", "yyyy-mm-dd HH:mm:ss"); public static final DateTime DATE_FLAG = DateUtil.parse("1970-01-02 00:00:00", "yyyy-MM-dd HH:mm:ss");
/*------------------------------字典------------------------------*/ /*------------------------------字典------------------------------*/
......
...@@ -115,6 +115,7 @@ public class EnergyConsumptionAnalysisService { ...@@ -115,6 +115,7 @@ public class EnergyConsumptionAnalysisService {
.powerConsumption(ent.getPowerConsumption()) .powerConsumption(ent.getPowerConsumption())
.powerGeneration(ent.getPowerGeneration()) .powerGeneration(ent.getPowerGeneration())
.dataDate(ent.getDataDate()) .dataDate(ent.getDataDate())
.dateFormat(DateUtil.format(ent.getDataDate(), "MM-dd"))
.absorptionRate(this.getAbsorptionRate(ent.getPowerGeneration(), ent.getPowerConsumption())) .absorptionRate(this.getAbsorptionRate(ent.getPowerGeneration(), ent.getPowerConsumption()))
.build()); .build());
} }
......
...@@ -31,4 +31,7 @@ public class DynamicQueryEnergyConsumptionAnalysisViewOutput { ...@@ -31,4 +31,7 @@ public class DynamicQueryEnergyConsumptionAnalysisViewOutput {
@XText("日期") @XText("日期")
private Date dataDate; private Date dataDate;
@XText("日期")
private String dateFormat;
} }
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