From 5ee338a5e19319386f2f6298d22a8e4ac96dc7cb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 May 2021 15:24:42 +0800
Subject: [PATCH] 1.设备故障状态合并到设备状态中，设备状态接口修改 2.警情处理完成后修改设备状态为正常，修改警情处理接口
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
index 7d415e2..75a336b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java
@@ -18,6 +18,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
import org.springblade.jfpt.alarm.vo.AlarmVO;
import org.springblade.jfpt.equipment.entity.Equipment;
import org.springblade.jfpt.equipment.vo.EquipmentVO;
@@ -36,10 +37,11 @@
List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentVO equipment,List childList);
- List<EquipmentVO> selectDeptPages(IPage page, EquipmentVO equipment,List childList,String dxtype);
+ List<EquipmentVO> selectDeptPages(IPage page, EquipmentVO equipment,@Param("pid") String pid,String dxtype);
void s(Equipment equipment);
void updateOne(Equipment equipment);
+ void saveImg(EquipmentVO equipment);
void updataType(String arr);
void updataTypeC(String arr);
/**
@@ -49,7 +51,9 @@
*/
List<EquipmentVOS> tree();
- List<EquipmentVO> listAll();
+ List<EquipmentVO> listAll(@Param("equipment") EquipmentVO equipment);
+
+ List<EquipmentVO> listAlls();
/**
* 懒加载部门列表
@@ -69,7 +73,14 @@
List<Map<String, Object>> selectInfos(String deviceNumber);
void updateChannel(String heartbeat, String deviceNumber);
void updateexpireTime(String expireTime, String deviceNumber);
- void updateExstate(String state,String reason, String deviceNumber);
+
+ /**
+ * 修改设备状态 2021-5-6 arsn修改
+ * @param dtype 设备状态
+ * @param reason 原因
+ * @param deviceNumber 设备编号
+ */
+ void updateExstate(String dtype,String reason, String deviceNumber);
Integer selectEqCz();
Integer selectEqCd();
List<Map<String, Object>> selectEqCy(String time);
--
Gitblit v1.9.3