From 747bd4d3d044b5d80af0deedd0f7761006b165b6 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Tue, 27 Jun 2023 15:00:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E7=BD=AE=E6=9F=A5=E8=AF=A2=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shxy/xymanager_common/model/TerminalListModel.java | 3 +++ .../shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java | 2 +- .../com/shxy/xymanager_service/impl/TerminalServiceImpl.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java index cbdc07c..c812eff 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java @@ -98,6 +98,9 @@ public class TerminalListModel implements Serializable { @ApiModelProperty(value = "是否在线", example = "213") private boolean isonline; + @ApiModelProperty(value = "是否删除", example = "0--删除1--未删除") + private Integer status; + @ApiModelProperty(value = "通道编号和名称", example = "213") private List list; diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java index ef34672..7f71b18 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalAlarmServiceImpl.java @@ -16,7 +16,6 @@ import com.shxy.xymanager_common.vo.TerminalAlarmIdVo; import com.shxy.xymanager_common.vo.TerminalAlarmSelectVo; import com.shxy.xymanager_common.vo.UpdateTerminalAlarmParamsVo; import com.shxy.xymanager_dao.dao.*; -import com.shxy.xymanager_service.cache.XyCache; import com.shxy.xymanager_service.service.CacheService; import com.shxy.xymanager_service.service.TerminalAlarmService; import lombok.extern.slf4j.Slf4j; @@ -120,6 +119,7 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { PageUtils.SetPage(pageindex, pagesize); list = terminalImgAlarmsDao.selectAlarmsDetails(termidlist, labellist, BigInteger.valueOf(start), BigInteger.valueOf(end)); } + log.info("告警信息列表数据:" + list.toString()); if (CollectionUtil.isNotEmpty(list)) { Map terminalMap = cacheService.getTerminalMap(); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index 1ef2b50..5441809 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -123,6 +123,7 @@ public class TerminalServiceImpl implements TerminalService { terminalsBean.setBatteryCapacity(item.getBatteryCapacity()); terminalsBean.setBatteryVoltage(item.getBatteryVoltage()); terminalsBean.setLastHeartbeat(item.getLastHeartbeat()); + terminalsBean.setStatus(item.getStatus()); boolean b = TerminalUtils.judgeTerminalStatus(item.getLastHeartbeat()); terminalsBean.setIsonline(b); TermAndChannelDto termAndChannelDto = termAndChannelMap.get(item.getId());