xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0918优化-实时运行曲线图时间格式处理

Browse Source
This commit is contained in:
mashili
2025-09-27 15:11:57 +08:00
parent ee53ab137b
commit 33534cc500
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryAveSOCVo.java
View File

@ -11,18 +11,18 @@ public class BatteryAveSOCVo {
/** /**
* 数据时间 * 数据时间
*/ */
private Date createDate; private String createDate;
/** /**
* 实时SOC * 实时SOC
*/ */
private BigDecimal batterySOC; private BigDecimal batterySOC;
public Date getCreateDate() { public String getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Date createDate) { public void setCreateDate(String createDate) {
this.createDate = createDate; this.createDate = createDate;
} }

6
ems-system/src/main/java/com/xzzn/ems/domain/vo/BatteryAveTempVo.java
View File

@ -11,18 +11,18 @@ public class BatteryAveTempVo {
/** /**
* 数据时间 * 数据时间
*/ */
private Date createDate; private String createDate;
/** /**
* 实时温度 * 实时温度
*/ */
private BigDecimal batteryTemp; private BigDecimal batteryTemp;
public Date getCreateDate() { public String getCreateDate() {
return createDate; return createDate;
} }
public void setCreateDate(Date createDate) { public void setCreateDate(String createDate) {
this.createDate = createDate; this.createDate = createDate;
} }

7
ems-system/src/main/resources/mapper/ems/EmsBatteryClusterMapper.xml
View File

@ -328,13 +328,14 @@
<select id="getBatteryAveTempList" resultType="com.xzzn.ems.domain.vo.BatteryAveTempVo"> <select id="getBatteryAveTempList" resultType="com.xzzn.ems.domain.vo.BatteryAveTempVo">
select t.site_id, select t.site_id,
avg(t.avg_cell_temp) as batteryTemp, avg(t.avg_cell_temp) as batteryTemp,
DATE_FORMAT(t.create_time, '%Y-%m-%d %H:%i:00') AS createDate DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay,
DATE_FORMAT(t.create_time, '%H:%i:00') AS createDate
from ems_battery_cluster t from ems_battery_cluster t
where t.site_id = #{siteId} where t.site_id = #{siteId}
AND t.create_time &gt;= Date(#{startDate}) AND t.create_time &gt;= Date(#{startDate})
AND t.create_time &lt;= #{endDate} AND t.create_time &lt;= #{endDate}
GROUP BY t.site_id,DATE_FORMAT(t.create_time, '%Y-%m-%d %H:%i:00') GROUP BY t.site_id,dateDay,createDate
order by createDate order by dateDay,createDate
</select> </select>
<select id="getClusterDataByHour" resultType="com.xzzn.ems.domain.vo.ClusterStatisListVo"> <select id="getClusterDataByHour" resultType="com.xzzn.ems.domain.vo.ClusterStatisListVo">

14
ems-system/src/main/resources/mapper/ems/EmsBatteryStackMapper.xml
View File

@ -348,13 +348,14 @@
<select id="getBatteryAveTempList" resultType="com.xzzn.ems.domain.vo.BatteryAveTempVo"> <select id="getBatteryAveTempList" resultType="com.xzzn.ems.domain.vo.BatteryAveTempVo">
select t.site_id, select t.site_id,
avg(t.avg_temperature) as batteryTemp, avg(t.avg_temperature) as batteryTemp,
DATE_FORMAT(t.create_time, '%Y-%m-%d %H:%i:00') AS createDate DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay,
DATE_FORMAT(t.create_time, '%H:%i:00') AS createDate
from ems_battery_stack t from ems_battery_stack t
where t.site_id = #{siteId} where t.site_id = #{siteId}
AND t.create_time &gt;= Date(#{startDate}) AND t.create_time &gt;= Date(#{startDate})
AND t.create_time &lt;= #{endDate} AND t.create_time &lt;= #{endDate}
GROUP BY t.site_id,createDate GROUP BY t.site_id,dateDay,createDate
order by createDate order by dateDay,createDate
</select> </select>
<sql id="statisCommonFilter"> <sql id="statisCommonFilter">
@ -495,12 +496,13 @@
<select id="getAveSocList" resultType="com.xzzn.ems.domain.vo.BatteryAveSOCVo"> <select id="getAveSocList" resultType="com.xzzn.ems.domain.vo.BatteryAveSOCVo">
select t.site_id, select t.site_id,
avg(t.stack_soc) as batterySOC, avg(t.stack_soc) as batterySOC,
DATE_FORMAT(t.create_time, '%Y-%m-%d %H:%i:00') AS createDate DATE_FORMAT(t.create_time, '%Y-%m-%d') AS dateDay,
DATE_FORMAT(t.create_time, '%H:%i:00') AS createDate
from ems_battery_stack t from ems_battery_stack t
where t.site_id = #{siteId} where t.site_id = #{siteId}
AND t.create_time &gt;= Date(#{startDate}) AND t.create_time &gt;= Date(#{startDate})
AND t.create_time &lt;= #{endDate} AND t.create_time &lt;= #{endDate}
GROUP BY t.site_id,DATE_FORMAT(t.create_time, '%Y-%m-%d %H:%i:00') GROUP BY t.site_id,dateDay,createDate
order by createDate order by dateDay,createDate
</select> </select>
</mapper> </mapper>