装置查询优化

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<ChannelBeans> list;
 

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<Integer, Terminals> terminalMap = cacheService.getTerminalMap();

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());