From 3f667355c7013b459f3ab5ec0c1bc035d7e2d5aa Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Wed, 31 Jan 2024 10:57:28 +0800
Subject: [PATCH] fix：sql查询时间调整
---
screen-job/src/main/resources/mapper/DeviceMapper.xml | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/screen-job/src/main/resources/mapper/DeviceMapper.xml b/screen-job/src/main/resources/mapper/DeviceMapper.xml
index 7831eb5..359ec1b 100644
--- a/screen-job/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-job/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,6 +25,29 @@
<result column="install_time" property="installTime"/>
<result column="is_delete" property="isDelete"/>
<result column="extend" property="extend"/>
+ <result column="town_code" property="townCode"/>
</resultMap>
+<select id="ListDeviceExcel" resultType="com.moral.api.util.DeviceExcelDTO">
+ SELECT
+ t1.mac,
+ t.NAME,
+ t1.time,
+ cast( t1.`value` -> '$.a34004' AS DOUBLE ) AS a34004,
+ cast( t1.`value` -> '$.a01001' AS DOUBLE ) AS a01001,
+ cast( t1.`value` -> '$.a01002' AS DOUBLE ) AS a01002,
+ cast( t1.`value` -> '$.a00e13' AS DOUBLE ) AS a00e13,
+ cast( t1.`value` -> '$.a00e19' AS DOUBLE ) AS a00e19,
+ cast( t1.`value` -> '$.a31001' AS DOUBLE ) AS a31001,
+ cast( t1.`value` -> '$.a99054' AS DOUBLE ) AS a99054
+ FROM
+ device t
+ LEFT JOIN history_minutely_${mon} t1 ON t1.mac = t.mac
+ WHERE
+ t.organization_id = #{id}
+ AND date(t1.time) <![CDATA[=]]> #{startTime}
+ ORDER BY
+ t1.time,
+ t1.mac
+</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0