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

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +31170 -1038
260 changed files with 31170 additions and 1038 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 15b964b4ce - Show all commits

9
ems-system/src/main/java/com/xzzn/ems/mapper/EmsPointMatchMapper.java
View File

@ -80,21 +80,24 @@ public interface EmsPointMatchMapper
@Param("tableField")String tableField,
@Param("startDate")Date startDate,
@Param("endDate")Date endDate,
@Param("params") Map<String, List<String>> params);
@Param("params") Map<String, List<String>> params,
@Param("clusterDeviceId")String clusterDeviceId);
// 根据条件查询数据-按小时-单体电池特殊处理
public List<GeneralQueryDataVo> getBatteryPointDataByHours(@Param("siteIds")List<String> siteIds,
@Param("tableName")String tableName,
@Param("tableField")String tableField,
@Param("startDate") Date startDate,
@Param("endDate")Date endDate,
@Param("params") Map<String, List<String>> params);
@Param("params") Map<String, List<String>> params,
@Param("clusterDeviceId")String clusterDeviceId);
// 根据条件查询数据-按天-单体电池特殊处理
public List<GeneralQueryDataVo> getBatteryPointDataByDays(@Param("siteIds")List<String> siteIds,
@Param("tableName")String tableName,
@Param("tableField")String tableField,
@Param("startDate")Date startDate,
@Param("endDate")Date endDate,
@Param("params") Map<String, List<String>> params);
@Param("params") Map<String, List<String>> params,
@Param("clusterDeviceId")String clusterDeviceId);
// 根据条件查询数据-按分钟-其他设备
public List<GeneralQueryDataVo> getCommonPointDataByMinutes(@Param("siteIds")List<String> siteIds,

7
ems-system/src/main/java/com/xzzn/ems/service/impl/GeneralQueryServiceImpl.java
View File

@ -158,12 +158,13 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService
List<GeneralQueryDataVo> dataVoList = new ArrayList<>();
int dataUnit = request.getDataUnit();
String clusterDeviceId = request.getDeviceId();
Date startDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,request.getStartDate());
Date endDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS,request.getEndDate());
Map<String,List<String>> siteDeviceMap = request.getSiteDeviceMap();
if (dataUnit == 1) { // 分钟
startDate = DateUtils.adjustToStartOfMinutes(request.getStartDate());
dataVoList = emsPointMatchMapper.getBatteryPointDataByMinutes(querySiteIds,tableName,tableField,startDate,endDate,siteDeviceMap);
dataVoList = emsPointMatchMapper.getBatteryPointDataByMinutes(querySiteIds,tableName,tableField,startDate,endDate,siteDeviceMap,clusterDeviceId);
if (dataVoList != null && dataVoList.size() > 0) {
dataVoList = dealWithBatteryMinutesData(querySiteIds,dataVoList,deviceCategory,
request.getStartDate(),request.getEndDate(),siteDeviceMap);
@ -171,11 +172,11 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService
} else if (dataUnit == 2) { // 小时
startDate = DateUtils.adjustToStartOfHour(request.getStartDate());
tableName = "ems_battery_data_hour";
dataVoList = emsPointMatchMapper.getBatteryPointDataByHours(querySiteIds,tableName,tableField,startDate,endDate,siteDeviceMap);
dataVoList = emsPointMatchMapper.getBatteryPointDataByHours(querySiteIds,tableName,tableField,startDate,endDate,siteDeviceMap,clusterDeviceId);
} else if (dataUnit == 3) { // 天
endDate = DateUtils.adjustToEndOfDay(request.getEndDate());
tableName = "ems_battery_data_day";
dataVoList = emsPointMatchMapper.getBatteryPointDataByDays(querySiteIds,tableName,tableField,startDate,endDate,siteDeviceMap);
dataVoList = emsPointMatchMapper.getBatteryPointDataByDays(querySiteIds,tableName,tableField,startDate,endDate,siteDeviceMap,clusterDeviceId);
}
// 数据转换
result = convertBatteryToResultList(dataVoList);

3
ems-system/src/main/resources/mapper/ems/EmsPointMatchMapper.xml
View File

@ -165,6 +165,9 @@
</select>
<sql id="commonFilter">
<if test="clusterDeviceId != null and clusterDeviceId != ''">
and cluster_device_id = #{clusterDeviceId}
</if>
<choose>
<when test="params != null and !params.isEmpty()">
AND ( <trim prefixOverrides="OR">