From 670bc85ba8468dbe9a427abc54f2bca9d4e71749 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 23 Apr 2021 16:32:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 aaf6ad2..ed26d04 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,8 +37,11 @@
List<EquipmentVO> selectEquipmentPage(IPage page, EquipmentVO equipment,List childList);
+ List<EquipmentVO> selectDeptPages(IPage page, EquipmentVO equipment,List childList,String dxtype);
+
void s(Equipment equipment);
void updateOne(Equipment equipment);
+ void saveImg(EquipmentVO equipment);
void updataType(String arr);
void updataTypeC(String arr);
/**
@@ -47,7 +51,9 @@
*/
List<EquipmentVOS> tree();
- List<EquipmentVO> listAll();
+ List<EquipmentVO> listAll(@Param("equipment") EquipmentVO equipment);
+
+ List<EquipmentVO> listAlls();
/**
* 懒加载部门列表
@@ -66,4 +72,10 @@
EquipmentVOS selectInfo(Equipment equipment);
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);
+ Integer selectEqCz();
+ Integer selectEqCd();
+ List<Map<String, Object>> selectEqCy(String time);
+ Integer selectEqCg();
}
--
Gitblit v1.9.3