From 47a458ca867f700ad8dfe8bccdbb6bf59ca2d301 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 11 May 2021 15:54:02 +0800
Subject: [PATCH] APP接口调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java | 91 +++++++++++++++++++++++++--------------------
1 files changed, 50 insertions(+), 41 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 1d499c3..ef97b44 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
@@ -151,28 +151,32 @@
*/
@Override
public Integer selectEquipmentCount(ConditionVo conditionVo) {
+ //更新设备状态
+ updateEquipmentDtype();
//先查询所有的设备
- List<EquipmentVO> equipmentVOS = baseMapper.listAlls();
- 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 {
- if(null!=e.getHeartbeat()) {
- hearbeat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(e.getHeartbeat()).getTime();
- }
- } catch (ParseException parseException) {
- parseException.printStackTrace();
- }
- //对比心跳时间
- if (time-hearbeat<TIME_DIFFERENCE){
- equipmentCount+=1;
- }
- }
- }
+ Integer equipmentCount = baseMapper.selectEqCz();
+ System.out.println("equipmentCount = " + equipmentCount);
+// long time = new Date().getTime();
+// long hearbeat = 0;
+// //遍历集合数据，对比心跳时间，得出在线的设备数量
+// int status =0;
+// if (status==0 && equipmentVOS.size()>0){
+// for (EquipmentVO e:equipmentVOS) {
+// try {
+// if(null!=e.getHeartbeat()) {
+// hearbeat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(e.getHeartbeat()).getTime();
+// }
+// } catch (ParseException parseException) {
+// parseException.printStackTrace();
+// }
+// //对比心跳时间
+// if (null!=e.getDtype()) {
+// if (time - hearbeat < TIME_DIFFERENCE && e.getDtype()!="2" && e.getDtype()!="3") {
+// equipmentCount += 1;
+// }
+// }
+// }
+// }
//返回数据
return equipmentCount;
}
@@ -231,7 +235,30 @@
*/
@Override
public Map<String, Object> selEqTypeSum() {
- //查詢之前先更新设备状态
+ //设备在线数量
+ Integer integerz = baseMapper.selectEqCz();
+ //设备掉线数量
+ Integer integerd = baseMapper.selectEqCd();
+ //设备预警数量
+ Integer alarmSum = baseMapper.selectEqCys();
+ //设备故障数量
+ Integer integerg = baseMapper.selectEqCg();
+ //封装数据
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("zx", integerz);
+ map.put("dx", integerd);
+ map.put("yj", alarmSum);
+ map.put("gz", integerg);
+ //返回数据
+ return map;
+ }
+
+
+ /**
+ * 更新设备状态
+ */
+ @Override
+ public void updateEquipmentDtype() {
//查询所有的设备，不包含故障和警情状态
List<Equipment> equipment = baseMapper.selAllEq();
long time = new Date().getTime();
@@ -252,15 +279,13 @@
equipmentListz.add(e.getId());
}
}
+ //不在线
if (time-hearbeat>=TIME_DIFFERENCE){
if (null==e.getDtype() || e.getDtype()!="0"){
equipmentListl.add(e.getId());
}
}
}
-
- System.out.println("equipmentListl = " + equipmentListl);
- System.out.println("equipmentListz = " + equipmentListz);
//批量更新数据
if (equipmentListz.size()>0){
baseMapper.updateEqListz(equipmentListz);
@@ -268,21 +293,5 @@
if (equipmentListl.size()>0){
baseMapper.updateEqListl(equipmentListl);
}
- //设备在线数量
- Integer integerz = baseMapper.selectEqCz();
- //设备掉线数量
- Integer integerd = baseMapper.selectEqCd();
- //设备预警数量
- Integer alarmSum = baseMapper.selectEqCys();
- //设备故障数量
- Integer integerg = baseMapper.selectEqCg();
- //封装数据
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("zx", integerz);
- map.put("dx", integerd);
- map.put("yj", alarmSum);
- map.put("gz", integerg);
- //返回数据
- return map;
}
}
--
Gitblit v1.9.3