From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 75cfd12..8aff20b 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.system.cache.SysCache;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -59,6 +60,21 @@
return page.setRecords(baseMapper.selectEquipmentPage(page,equipment,null));
}
+
+
+ @Override
+ public IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid) {
+
+ List deptIdList;
+ if (!pid.equals("")){
+ deptIdList = SysCache.getDeptChildIds(Long.valueOf(pid));
+ }else{
+ deptIdList = SysCache.getDeptChildIds(null);
+ }
+ return page.setRecords(baseMapper.selectDeptPages(page,equipment,deptIdList));
+ }
+
+
@Override
public List<EquipmentVOS> tree() {
@@ -136,10 +152,12 @@
int equipmentCount = 0;
long hearbeat = 0;
//遍历集合数据，对比心跳时间，得出在线的设备数量
- if (status==0){
+ if (status==0 && equipmentVOS.size()>0){
for (EquipmentVO e:equipmentVOS) {
try {
- hearbeat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(e.getHeartbeat()).getTime();
+ if(null!=e.getHeartbeat()) {
+ hearbeat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(e.getHeartbeat()).getTime();
+ }
} catch (ParseException parseException) {
parseException.printStackTrace();
}
@@ -152,4 +170,14 @@
//返回数据
return equipmentCount;
}
+
+ @Override
+ public void updateexpireTime(String expireTime, String deviceNumber) {
+ baseMapper.updateexpireTime(expireTime,deviceNumber);
+ }
+
+ @Override
+ public void updateExstate(String state, String reason, String deviceNumber) {
+ baseMapper.updateExstate(state, reason, deviceNumber);
+ }
}
--
Gitblit v1.9.3