From c7d05af4e7ebf92b67308df21bde17282c0c50f1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 May 2021 21:44:06 +0800
Subject: [PATCH] 1.警情导出bug修复 2.警情统计接口修改 3.一键报警设备接收报文时修改设备状态
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/service/impl/EquipmentServiceImpl.java | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 11 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 24b0863..c1f5c68 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
@@ -31,10 +31,12 @@
import org.springblade.system.cache.SysCache;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -66,13 +68,13 @@
@Override
public IPage<EquipmentVO> selectDeptPages(IPage<EquipmentVO> page, EquipmentVO equipment,String pid,String dxdype) {
- List deptIdList;
- if (pid != null && !pid.equals("")){
- deptIdList = SysCache.getDeptChildIds(Long.valueOf(pid));
- }else{
- deptIdList = SysCache.getDeptChildIds(null);
- }
- return page.setRecords(baseMapper.selectDeptPages(page,equipment,deptIdList,dxdype));
+// List deptIdList;
+// if (pid != null && !pid.equals("")){
+// deptIdList = SysCache.getDeptChildIds(Long.valueOf(pid));
+// }else{
+// deptIdList = SysCache.getDeptChildIds(null);
+// }
+ return page.setRecords(baseMapper.selectDeptPages(page,equipment,pid,dxdype));
}
@@ -83,13 +85,18 @@
}
@Override
- public List<EquipmentVO> listAll() {
- return baseMapper.listAll();
+ public List<EquipmentVO> listAll(EquipmentVO equipment) {
+ return baseMapper.listAll(equipment);
}
@Override
public void updateOne(Equipment equipment) {
baseMapper.updateOne(equipment);
+ }
+
+ @Override
+ public void saveImg(EquipmentVO equipment) {
+ baseMapper.saveImg(equipment);
}
@Override
@@ -148,7 +155,7 @@
@Override
public Integer selectEquipmentCount(ConditionVo conditionVo) {
//先查询所有的设备
- List<EquipmentVO> equipmentVOS = baseMapper.listAll();
+ List<EquipmentVO> equipmentVOS = baseMapper.listAlls();
long time = new Date().getTime();
int equipmentCount = 0;
long hearbeat = 0;
@@ -178,9 +185,27 @@
baseMapper.updateexpireTime(expireTime,deviceNumber);
}
+ /**
+ * 修改设备状态 2021-5-6 arsn修改
+ * @param state 设备状态
+ * @param reason 原因
+ * @param deviceNumber 设备编号
+ */
@Override
+ @Transactional(rollbackFor = Exception.class)
public void updateExstate(String state, String reason, String deviceNumber) {
- baseMapper.updateExstate(state, reason, deviceNumber);
+ if(state.equals("系统故障")){
+ String dType = "3";
+ baseMapper.updateExstate(dType, reason, deviceNumber);
+ }
+ if(state.equals("一键报警")){
+ String dType = "2";
+ baseMapper.updateExstate(dType, reason, deviceNumber);
+ }
+ if(state.equals("处理完成")){
+ String dType = "1";
+ baseMapper.updateExstate(dType, reason, deviceNumber);
+ }
}
@Override
@@ -202,4 +227,28 @@
public Integer selectEqCg() {
return baseMapper.selectEqCg();
}
+
+ /**
+ * 获取各个设备状态统计数量
+ * @return
+ */
+ @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;
+ }
}
--
Gitblit v1.9.3