From f3b14ef7006c2c03e1dbef18504088f119ec5782 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 25 六月 2021 18:11:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/dao/SysContainerSensorsDao.xml | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/dao/SysContainerSensorsDao.xml b/src/main/java/com/nanometer/smartlab/dao/SysContainerSensorsDao.xml
index 70ba19d..d0b4e9a 100644
--- a/src/main/java/com/nanometer/smartlab/dao/SysContainerSensorsDao.xml
+++ b/src/main/java/com/nanometer/smartlab/dao/SysContainerSensorsDao.xml
@@ -21,7 +21,7 @@
id, container_id, temp, humidity, voc1, flag, type, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
- select
+ select
<include refid="Base_Column_List" />
from sys_container_sensors
where id = #{id,jdbcType=VARCHAR}
@@ -243,4 +243,22 @@
ORDER BY
slc.update_time DESC
</select>
-</mapper>
\ No newline at end of file
+ <select id="getRowData" resultType="com.nanometer.smartlab.entity.dto.ContainerStatusMngDto">
+ SELECT slc.id,slc.temp, slc.humidity,slc.voc1 ,sl.name as laboratoryName,slc.name laboratoryContainerName,slc.flag,
+ CASE
+ WHEN substring(flag, 1,1) = '1' THEN TRUE ELSE FALSE END AS lowTempAlert,
+ CASE
+ WHEN substring(flag, 2,1) = '1' THEN TRUE ELSE FALSE END AS highTempAlert,
+ CASE
+ WHEN substring(flag, 3,1) = '1' THEN TRUE ELSE FALSE END AS lowHumidityAlert,
+ CASE
+ WHEN substring(flag, 4,1) = '1' THEN TRUE ELSE FALSE END AS highHumidityAlert,
+ CASE
+ WHEN substring(flag, 5,1) = '1' THEN TRUE ELSE FALSE END AS voc1Alert
+ from sys_laboratory_container slc
+ LEFT JOIN sys_laboratory sl ON sl.id = slc.laboratory_id
+ where slc.id = #{id}
+
+
+ </select>
+</mapper>
--
Gitblit v1.9.2