From eb3440d7c0c7baef5e6fc888fd0076b1787643d9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 07 Apr 2021 16:14:18 +0800
Subject: [PATCH] 预警时间分布接口新增
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
index 8aff20b..24b0863 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java
@@ -27,6 +27,7 @@
import org.springblade.jfpt.equipment.service.IEquipmentService;
import org.springblade.jfpt.equipment.vo.EquipmentVO;
import org.springblade.jfpt.equipment.vo.EquipmentVOS;
+import org.springblade.jfpt.parcel.vo.ConditionVo;
import org.springblade.system.cache.SysCache;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -63,15 +64,15 @@
@Override
- public IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid) {
+ public IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid,String dxdype) {
List deptIdList;
- if (!pid.equals("")){
+ if (pid != null && !pid.equals("")){
deptIdList = SysCache.getDeptChildIds(Long.valueOf(pid));
}else{
deptIdList = SysCache.getDeptChildIds(null);
}
- return page.setRecords(baseMapper.selectDeptPages(page,equipment,deptIdList));
+ return page.setRecords(baseMapper.selectDeptPages(page,equipment,deptIdList,dxdype));
}
@@ -141,17 +142,18 @@
/**
* 查询在线设备总数
- * @param status 状态码 0：本日 1：本周 2：本月
+ * @param conditionVo status 状态码 0：本日 1：本周 2：本月
* @return
*/
@Override
- public Integer selectEquipmentCount(Integer status) {
+ public Integer selectEquipmentCount(ConditionVo conditionVo) {
//先查询所有的设备
List<EquipmentVO> equipmentVOS = baseMapper.listAll();
long time = new Date().getTime();
int equipmentCount = 0;
long hearbeat = 0;
//遍历集合数据，对比心跳时间，得出在线的设备数量
+ int status =0;
if (status==0 && equipmentVOS.size()>0){
for (EquipmentVO e:equipmentVOS) {
try {
@@ -180,4 +182,24 @@
public void updateExstate(String state, String reason, String deviceNumber) {
baseMapper.updateExstate(state, reason, deviceNumber);
}
+
+ @Override
+ public Integer selectEqCz() {
+ return baseMapper.selectEqCz();
+ }
+
+ @Override
+ public Integer selectEqCd() {
+ return baseMapper.selectEqCd();
+ }
+
+ @Override
+ public List<Map<String, Object>> selectEqCy(String time) {
+ return baseMapper.selectEqCy(time);
+ }
+
+ @Override
+ public Integer selectEqCg() {
+ return baseMapper.selectEqCg();
+ }
}
--
Gitblit v1.9.3