From 5f72ddd4ca8a10d5dcb4e1ab79463593317ffbe6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 28 八月 2023 14:22:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java b/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
index b6e6f00..8d58673 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
+++ b/standard-server/src/main/java/com/yuanchu/mom/service/DeviceService.java
@@ -30,5 +30,15 @@
@Transactional(rollbackFor = Exception.class)
Boolean addDevice(Device device);
- List<Map<String, Object>> deviceTwoTree(Integer type);
+ List<Map<String, Object>> deviceTwoTree(Integer type, String search_class);
+
+ List<Map<String, Object>> DevicePageList(String codeNameModel, Integer type, Integer deviceStatue, Integer deviceId, String fatherName);
+
+ Integer deviceDelete(Integer deviceId);
+
+ List<Map<String, Object>> getDeviceNameByGroup(String deviceGroup);
+
+ Integer deviceDeleteIdOrFather(Integer id, Integer type, String deviceFather);
+
+ List<Map<String, Object>> selectDeviceIdAndName();
}
--
Gitblit v1.9.3