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 |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/screen-manage/src/main/resources/mapper/DeviceMapper.xml b/screen-manage/src/main/resources/mapper/DeviceMapper.xml
index d1c0809..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"/>
@@ -52,6 +53,12 @@
             <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>
 
         <!--������-->
@@ -121,6 +128,8 @@
             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,
@@ -136,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