From f4e06be2e50d54a956ccd26c93661c4ab9d19bf6 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 07 Oct 2023 14:25:24 +0800
Subject: [PATCH] ci:补充提交
---
screen-manage/src/main/resources/mapper/DeviceMapper.xml | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/DeviceMapper.xml b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
index 8e24faa..ead9eb8 100644
--- a/screen-manage/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
@@ -25,6 +25,8 @@
<result column="install_time" property="installTime"/>
<result column="is_delete" property="isDelete"/>
<result column="extend" property="extend"/>
+ <result column="town_code" property="townCode"/>
+ <result column="dev_num" property="devNum"/>
</resultMap>
<resultMap id="resultMap" type="com.moral.api.pojo.vo.device.DeviceVO" extends="BaseResultMap">
@@ -62,6 +64,12 @@
<association property="version" javaType="com.moral.api.entity.Version">
<result column="version_id" property="id"/>
<result column="version_name" property="name"/>
+ </association>
+
+ <!--������������-->
+ <association property="town" javaType="java.util.HashMap">
+ <result column="town_code" property="townCode"/>
+ <result column="town_name" property="townName"/>
</association>
<!--���������������-->
@@ -124,6 +132,8 @@
d.create_time,
d.install_time,
d.extend,
+ d.town_code,
+ sa.area_name town_name,
o.id org_id,
o.`name` org_name,
mp.id mp_id,
@@ -156,13 +166,16 @@
(
ma.id, (SELECT operate_ids FROM device WHERE id = d.id)
)
+ LEFT JOIN `sys_area` sa
+ ON d.town_code = sa.area_code
LEFT JOIN
(
SELECT sdt.`name`, sdd.dataKey, sdd.dataValue
FROM sys_dict_type sdt,
sys_dict_data sdd
WHERE sdt.id = sdd.dict_type_id
- AND sdt.`name` = 'profession'
+ AND sdt.`name` = 'profession'
+ AND sdd.is_delete = '0'
) profession
ON FIND_IN_SET
(
@@ -175,7 +188,8 @@
FROM sys_dict_type sdt,
sys_dict_data sdd
WHERE sdt.id = sdd.dict_type_id
- AND sdt.`name` = 'tech'
+ AND sdt.`name` = 'tech'
+ AND sdd.is_delete = '0'
) tech
ON d.tech = tech.dataKey
@@ -185,7 +199,8 @@
FROM sys_dict_type sdt,
sys_dict_data sdd
WHERE sdt.id = sdd.dict_type_id
- AND sdt.`name` = 'detector'
+ AND sdt.`name` = 'detector'
+ AND sdd.is_delete = '0'
) detector
ON d.detector = detector.dataKey
@@ -195,7 +210,8 @@
FROM sys_dict_type sdt,
sys_dict_data sdd
WHERE sdt.id = sdd.dict_type_id
- AND sdt.`name` = 'purchaser'
+ AND sdt.`name` = 'purchaser'
+ AND sdd.is_delete = '0'
) purchaser
ON d.purchaser = purchaser.dataKey
WHERE d.id = #{deviceId}
@@ -235,7 +251,10 @@
on
d.`device_version_id` = oua.`version_id` and d.`organization_id` = oua.`organization_id` and oua.`is_delete` = 0
where
- d.`is_delete` = 0;
+ d.`is_delete` = 0
+ <if test="mac != null and mac != '' ">
+ and d.mac = #{mac}
+ </if>
</select>
--
Gitblit v1.8.0