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/resources/mapper/DeviceMapper.xml | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 48c7c3a..959ae30 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -39,8 +39,8 @@
<foreach collection="macs" item="mac" index="index" open="(" close=")" separator=",">
#{mac}
</foreach>
- AND `time` <![CDATA[>=]]> #{start}
- AND `time` <![CDATA[<]]> #{end}
+ AND DATE_FORMAT(`time`,'%Y-%m-%d %H') <![CDATA[>=]]> #{start}
+ AND DATE_FORMAT(`time`,'%Y-%m-%d %H') <![CDATA[<]]> #{end}
ORDER BY `time`
</select>
<select id="deviceList" resultType="java.util.Map">
@@ -188,4 +188,24 @@
i.is_delete = 0
) t3
</select>
+ <select id="deviceMacs" resultType="java.lang.String">
+ select mac from device where organization_id = #{organizationId} order by id desc
+
+ </select>
+
+ <select id="getDevices" resultType="com.moral.api.pojo.vo.device.AppDeviceVo">
+ SELECT d.id,d.`name`,d.mac,d.special_type FROM device as d
+ where 1=1
+ <if test="organizationId !=null">
+ AND organization_id = #{organizationId}
+ </if>
+ and mac LIKE "%"#{mac}"%" or `name` like "%"#{mac}"%" AND is_delete = 0
+ union
+ SELECT sd.id,sd.`name`,sd.mac,sd.special_type FROM special_device as sd
+ WHERE 1=1
+ <if test="organizationId !=null">
+ AND organization_id = #{organizationId}
+ </if>
+ and mac LIKE "%"#{mac}"%" AND is_delete = 0
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0