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 +25790 -998
232 changed files with 25790 additions and 998 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ecbe55cdbf - Show all commits

10
ems-system/src/main/java/com/xzzn/ems/domain/vo/PointNameRequest.java
View File

@ -22,6 +22,8 @@ public class PointNameRequest {
private String endDate;
private String deviceId;
private Map<String,List<String>> siteDeviceMap;
public List<String> getSiteIds() {
@ -79,4 +81,12 @@ public class PointNameRequest {
public void setSiteDeviceMap(Map<String, List<String>> siteDeviceMap) {
this.siteDeviceMap = siteDeviceMap;
}
public String getDeviceId() {
return deviceId;
}
public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}
}

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

@ -100,17 +100,20 @@ public interface EmsPointMatchMapper
@Param("tableName")String tableName,
@Param("tableField")String tableField,
@Param("startDate")Date startDate,
@Param("endDate")Date endDate);
@Param("endDate")Date endDate,
@Param("deviceId")String deviceId);
// 根据条件查询数据-按小时-其他设备
public List<GeneralQueryDataVo> getCommonPointDataByHours(@Param("siteIds")List<String> siteIds,
@Param("tableName")String tableName,
@Param("tableField")String tableField,
@Param("startDate") Date startDate,
@Param("endDate")Date endDate);
@Param("endDate")Date endDate,
@Param("deviceId")String deviceId);
// 根据条件查询数据-按天-其他设备
public List<GeneralQueryDataVo> getCommonPointDataByDays(@Param("siteIds")List<String> siteIds,
@Param("tableName")String tableName,
@Param("tableField")String tableField,
@Param("startDate")Date startDate,
@Param("endDate")Date endDate);
@Param("endDate")Date endDate,
@Param("deviceId")String deviceId);
}

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

@ -129,20 +129,21 @@ public class GeneralQueryServiceImpl implements IGeneralQueryService
List<GeneralQueryDataVo> dataVoList = new ArrayList<>();
int dataUnit = request.getDataUnit();
String deviceId = 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());
if (dataUnit == 1) { // 分钟：yyyy-MM-dd HH:mm:ss
startDate = DateUtils.adjustToStartOfMinutes(request.getStartDate());
dataVoList = emsPointMatchMapper.getCommonPointDataByMinutes(querySiteIds,tableName,tableField,startDate,endDate);
dataVoList = emsPointMatchMapper.getCommonPointDataByMinutes(querySiteIds,tableName,tableField,startDate,endDate,deviceId);
if (dataVoList != null && dataVoList.size() > 0) {
dataVoList = dealWithMinutesData(querySiteIds,dataVoList,deviceCategory,
request.getStartDate(),request.getEndDate());
}
} else if (dataUnit == 2) { // 小时：yyyy-MM-dd HH:mm:ss
dataVoList = emsPointMatchMapper.getCommonPointDataByHours(querySiteIds,tableName,tableField,startDate,endDate);
dataVoList = emsPointMatchMapper.getCommonPointDataByHours(querySiteIds,tableName,tableField,startDate,endDate,deviceId);
} else if (dataUnit == 3) { // 天：yyyy-MM-dd 00:00:00
endDate = DateUtils.adjustToEndOfDay(request.getEndDate());
dataVoList = emsPointMatchMapper.getCommonPointDataByDays(querySiteIds,tableName,tableField,startDate,endDate);
dataVoList = emsPointMatchMapper.getCommonPointDataByDays(querySiteIds,tableName,tableField,startDate,endDate,deviceId);
}
// 数据转换

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

@ -238,6 +238,9 @@
<foreach collection="siteIds" item="siteId" open="(" close=")" separator=",">
#{siteId}
</foreach>
<if test="deviceId != null and deviceId != ''">
and device_id = #{deviceId}
</if>
GROUP BY valueDate, site_id, device_id,pointValue
ORDER BY site_id,device_id, valueDate ASC
</select>
@ -259,6 +262,9 @@
<foreach collection="siteIds" item="siteId" open="(" close=")" separator=",">
#{siteId}
</foreach>
<if test="deviceId != null and deviceId != ''">
and device_id = #{deviceId}
</if>
GROUP BY site_id, device_id, hour_group
) tmp ON t.site_id = tmp.site_id
AND t.device_id = tmp.device_id
@ -285,6 +291,9 @@
<foreach collection="siteIds" item="siteId" open="(" close=")" separator=",">
#{siteId}
</foreach>
<if test="deviceId != null and deviceId != ''">
and device_id = #{deviceId}
</if>
GROUP BY site_id, device_id, day_group
) tmp ON t.site_id = tmp.site_id
AND t.device_id = tmp.device_id