From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Thu, 14 Dec 2023 15:38:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa --- screen-api/src/main/java/com/moral/api/service/DeviceService.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/DeviceService.java b/screen-api/src/main/java/com/moral/api/service/DeviceService.java index 923d79b..75f9d36 100644 --- a/screen-api/src/main/java/com/moral/api/service/DeviceService.java +++ b/screen-api/src/main/java/com/moral/api/service/DeviceService.java @@ -2,6 +2,7 @@ import com.moral.api.entity.Device; import com.baomidou.mybatisplus.extension.service.IService; +import com.moral.api.pojo.vo.device.AppDeviceVo; import java.util.List; import java.util.Map; @@ -51,4 +52,18 @@ */ Device getDeviceUnitAlramInforByMac(String mac); + /** + * ������������ + * @param mac + * @return + */ + List<AppDeviceVo> getFuzzySearch(String mac); + + /** + * ������������������������ + * @param id + * @return + */ + List<Device> getOrganizationDevice(Integer id); + } -- Gitblit v1.8.0