From 67b4ec045abcaec0df40e3b291441a9394da85c3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 22 Dec 2021 08:57:58 +0800
Subject: [PATCH] update
---
screen-manage/src/main/resources/mapper/DeviceMapper.xml | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/DeviceMapper.xml b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
index 6e7f549..28466d5 100644
--- a/screen-manage/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
@@ -14,6 +14,7 @@
<result column="operate_ids" property="operateIds"/>
<result column="monitor_point_id" property="monitorPointId"/>
<result column="organization_id" property="organizationId"/>
+ <result column="guid" property="guid"/>
<result column="device_version_id" property="deviceVersionId"/>
<result column="profession" property="profession"/>
<result column="tech" property="tech"/>
@@ -24,12 +25,10 @@
<result column="install_time" property="installTime"/>
<result column="is_delete" property="isDelete"/>
<result column="extend" property="extend"/>
+ <result column="town_code" property="townCode"/>
</resultMap>
<resultMap id="resultMap" type="com.moral.api.pojo.vo.device.DeviceVO" extends="BaseResultMap">
- <!--������-->
- <result column="profession_name" property="professionName"/>
-
<!--������-->
<result column="tech_name" property="techName"/>
@@ -49,7 +48,15 @@
<association property="monitorPoint" javaType="com.moral.api.entity.MonitorPoint">
<result column="mp_id" property="id"/>
<result column="mp_name" property="name"/>
- <result column="mp_address" property="address"/>
+ <result column="mp_area_code" property="areaCode"/>
+ <result column="mp_city_code" property="cityCode"/>
+ <result column="mp_province_code" property="provinceCode"/>
+ </association>
+
+ <!--������������-->
+ <association property="govMonitorPoint" javaType="com.moral.api.entity.GovMonitorPoint">
+ <result column="gmp_guid" property="guid"/>
+ <result column="gmp_name" property="name"/>
</association>
<!--������-->
@@ -58,10 +65,22 @@
<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>
+
<!--���������������-->
<collection property="operators" ofType="com.moral.api.entity.ManageAccount">
<result column="operate_id" property="id" jdbcType="INTEGER"/>
<result column="operate_name" property="userName" jdbcType="VARCHAR"/>
+ </collection>
+
+ <!--������-->
+ <collection property="professions" ofType="java.util.HashMap">
+ <result column="profession_key" property="dataKey" jdbcType="INTEGER"/>
+ <result column="profession_value" property="dataValue" jdbcType="VARCHAR"/>
</collection>
</resultMap>
@@ -112,16 +131,23 @@
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,
mp.`name` mp_name,
- mp.address mp_address,
+ mp.area_code mp_area_code,
+ mp.city_code mp_city_code,
+ mp.province_code mp_province_code,
+ gmp.guid gmp_guid,
+ gmp.name gmp_name,
ma.id operate_id,
v.id version_id,
v.`name` version_name,
ma.user_name operate_name,
- profession.dataValue profession_name,
+ profession.dataKey profession_key,
+ profession.dataValue profession_value,
tech.dataValue tech_name,
detector.dataValue detector_name,
purchaser.dataValue purchaser_name
@@ -132,20 +158,28 @@
ON d.organization_id = o.id
LEFT JOIN `monitor_point` mp
ON mp.id = d.monitor_point_id
+ LEFT JOIN `gov_monitor_point` gmp
+ ON gmp.guid = d.guid
LEFT JOIN `manage_account` ma
ON FIND_IN_SET
(
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 d.profession = profession.dataKey
+ ON FIND_IN_SET
+ (
+ profession.dataKey, (SELECT profession FROM device WHERE id = d.id)
+ )
LEFT JOIN
(
@@ -153,7 +187,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
@@ -163,7 +198,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
@@ -173,7 +209,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}
--
Gitblit v1.8.0