From bef458cd14d2e0f2b09d76b609291f47be3cd525 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期日, 24 四月 2022 16:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
index c1e8c86..e0a5447 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java
@@ -1,6 +1,7 @@
package com.sandu.ximon.dao.mapper;
import com.sandu.common.domain.BaseMapper;
+import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import org.apache.ibatis.annotations.Mapper;
@@ -8,6 +9,17 @@
@Mapper
public interface MonitorMapper extends BaseMapper<Monitor> {
- List<Monitor> listMonitorByKeyword(String keyword, String equipmentState1, String equipmentState2,
- String bindingState1, String bindingState2);
+ List<Monitor> listMonitorByKeyword(String keyword, int equipmentState1, int equipmentState2,
+ int bindingState1, int bindingState2);
+
+ List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);
+
+
+ List<MonitorBo> listMonitorByIds(List<String> list, int bindingState, int equipmentState);
+
+ List<String> listMonitorDeviceSerial(Long userid, String keyword);
}
+
+
+
+
--
Gitblit v1.9.3