From a0a6f95ec5b92be03385eea83b64bf97fcbfa17e Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Thu, 02 Nov 2023 17:08:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev --- screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java index 0f56b49..025f615 100644 --- a/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java +++ b/screen-api/src/main/java/com/moral/api/mapper/DeviceMapper.java @@ -5,6 +5,7 @@ import com.moral.api.entity.Device; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.moral.api.pojo.vo.device.AppDeviceVo; import io.lettuce.core.dynamic.annotation.Param; /** @@ -32,4 +33,8 @@ List<Integer> deviceOrgIdList(@Param("organizationId") int organizationId); + List<String> deviceMacs(@Param("organizationId") int organizationId); + + List<AppDeviceVo> getDevices(@Param("mac") String mac,@Param("organizationId") Integer organizationId); + } -- Gitblit v1.8.0