|
|
|
|
@ -114,16 +114,9 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS
|
|
|
|
|
List<EmsRecordSteamInstant> emsRecordSteamInstants = new ArrayList<>();
|
|
|
|
|
//判断监控编码是否为空
|
|
|
|
|
if (monitorCode == null){
|
|
|
|
|
//没有选择设备,monitorCode为空的时候,分组查询全部设备的最新一条记录
|
|
|
|
|
List<EmsRecordSteamInstant> allEmsRecordSteamInstants = emsRecordSteamInstantMapper
|
|
|
|
|
//没有选择设备,monitorCode为空的时候,从设备表驱动查询每个设备的最新一条记录
|
|
|
|
|
emsRecordSteamInstants = emsRecordSteamInstantMapper
|
|
|
|
|
.selectEmsRecordLatestSteamInstantList(emsRecordSteamInstant);
|
|
|
|
|
//遍历查询结果
|
|
|
|
|
for (EmsRecordSteamInstant recordSteamInstantallEmsRecordSteamInstants : allEmsRecordSteamInstants){
|
|
|
|
|
//如果有设备名称就添加到返回集合中
|
|
|
|
|
if (recordSteamInstantallEmsRecordSteamInstants.getMonitorName() != null){
|
|
|
|
|
emsRecordSteamInstants.add(recordSteamInstantallEmsRecordSteamInstants);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}else {
|
|
|
|
|
//选择了设备,monitorCode不为空的时候,根据monitorCode查询指定设备的最新一条记录
|
|
|
|
|
emsRecordSteamInstants = emsRecordSteamInstantMapper
|
|
|
|
|
|