From 5688e9adb709a253e1ce69b510457b9c88a645a9 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Sep 2021 16:39:18 +0800
Subject: [PATCH] screnn_api特殊设备实体类修改，走航车实时websocket,manage设备补偿
---
screen-api/src/main/resources/mapper/DeviceMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 94cde21..ce3522f 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/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"/>
@@ -28,11 +29,14 @@
<!--���������������������������-->
<select id="getTrendChartData" resultType="java.util.Map">
- SELECT
+ SELECT mac,
DATE_FORMAT(`time`,#{dateFormat}) AS `time`,
`value`->'$.${sensorCode}' AS '${sensorCode}'
FROM history_${timeUnits}
- WHERE mac = #{mac}
+ WHERE mac IN
+ <foreach collection="macs" item="mac" index="index" open="(" close=")" separator=",">
+ #{mac}
+ </foreach>
AND `time` <![CDATA[>=]]> #{start}
AND `time` <![CDATA[<]]> #{end}
ORDER BY `time`
--
Gitblit v1.8.0