From 0aed1c0e6a91207c15fa34f49a7dfa9b6e2b64c5 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 14 Sep 2021 10:24:06 +0800
Subject: [PATCH] screen-api 实时界面对数据进行保留小数位并且取整
---
screen-manage/src/main/resources/mapper/DeviceMapper.xml | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/DeviceMapper.xml b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
index 6e7f549..8b65e97 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"/>
@@ -49,7 +50,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>
<!--������-->
@@ -116,7 +125,11 @@
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,
@@ -132,6 +145,8 @@
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
(
--
Gitblit v1.8.0