From 7b43c04dd530bdd193e0cf02c4e19ba7c2ee2c11 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 10:41:31 +0800
Subject: [PATCH] 设备归属
---
dao/src/main/resources/mapper/LightReportDataMapper.xml | 111 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 22 deletions(-)
diff --git a/dao/src/main/resources/mapper/LightReportDataMapper.xml b/dao/src/main/resources/mapper/LightReportDataMapper.xml
index 360d7cc..7f035b5 100644
--- a/dao/src/main/resources/mapper/LightReportDataMapper.xml
+++ b/dao/src/main/resources/mapper/LightReportDataMapper.xml
@@ -5,28 +5,95 @@
<mapper namespace="com.sandu.ximon.dao.mapper.LightReportDataMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LightReportData">
- <id property="lightReportDataId" column="light_report_data_id" jdbcType="BIGINT"/>
- <result property="deviceMac" column="device_mac" jdbcType="VARCHAR"/>
- <result property="voltage" column="voltage" jdbcType="FLOAT"/>
- <result property="electricCurrent" column="electric_current" jdbcType="FLOAT"/>
- <result property="deviceTemperature" column="device_temperature" jdbcType="FLOAT"/>
- <result property="powerFactor" column="power_factor" jdbcType="FLOAT"/>
- <result property="activePower" column="active_power" jdbcType="FLOAT"/>
- <result property="reactivePower" column="reactive_power" jdbcType="FLOAT"/>
- <result property="lightPercent" column="light_percent" jdbcType="INTEGER"/>
- <result property="recentlyLightSec" column="recently_light_sec" jdbcType="BIGINT"/>
- <result property="totalLightSec" column="total_light_sec" jdbcType="BIGINT"/>
- <result property="recentlyUsingPower" column="recently_using_power" jdbcType="DOUBLE"/>
- <result property="totalUsingPower" column="total_using_power" jdbcType="DOUBLE"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <id property="lightReportDataId" column="light_report_data_id" jdbcType="BIGINT"/>
+ <result property="deviceCode" column="device_code" jdbcType="VARCHAR"/>
+ <result property="voltage" column="voltage" jdbcType="FLOAT"/>
+ <result property="electricCurrent" column="electric_current" jdbcType="FLOAT"/>
+ <result property="deviceTemperature" column="device_temperature" jdbcType="FLOAT"/>
+ <result property="powerFactor" column="power_factor" jdbcType="FLOAT"/>
+ <result property="activePower" column="active_power" jdbcType="FLOAT"/>
+ <result property="reactivePower" column="reactive_power" jdbcType="FLOAT"/>
+ <result property="lightPercent" column="light_percent" jdbcType="INTEGER"/>
+ <result property="light2Percent" column="light2_percent" jdbcType="INTEGER"/>
+ <result property="recentlyLightSec" column="recently_light_sec" jdbcType="BIGINT"/>
+ <result property="totalLightSec" column="total_light_sec" jdbcType="BIGINT"/>
+ <result property="recentlyUsingPower" column="recently_using_power" jdbcType="DOUBLE"/>
+ <result property="totalUsingPower" column="total_using_power" jdbcType="DOUBLE"/>
+ <result property="createTime1" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime1" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <sql id="Base_Column_List">
- light_report_data_id,device_mac,voltage,
- electric_current,device_temperature,power_factor,
- active_power,reactive_power,light_percent,
- recently_light_sec,total_light_sec,recently_using_power,
- total_using_power,create_time,update_time
- </sql>
+ <resultMap id="listReportData" type="com.sandu.ximon.dao.bo.LightReportDataBo" extends="BaseResultMap">
+ <result property="poleName" column="pole_name" jdbcType="VARCHAR"/>
+ </resultMap>
+
+ <select id="getNewestReportByDeviceCode" resultMap="BaseResultMap">
+ SELECT
+ t1.*
+ FROM
+ light_report_data t1
+ JOIN (
+ SELECT
+ MAX( light_report_data_id ) AS light_report_data_id
+ FROM
+ light_report_data
+ WHERE device_code IN
+ <foreach collection="deviceCodeList" open="(" close=")" separator="," item="deviceCode">
+ #{deviceCode}
+ </foreach>
+ GROUP BY device_code
+ ) AS t2 USING ( light_report_data_id )
+ </select>
+ <select id="listReportData" resultMap="listReportData">
+ SELECT
+ t1.* ,t2.pole_name
+ FROM
+ light_report_data t1
+ LEFT JOIN pole t2 USING ( device_code )
+ <where>
+ 1 = 1
+
+ <if test="deviceCode != null and deviceCode != ''">
+ AND t1.device_code = #{deviceCode}
+ </if>
+ <if test="keyword != null and keyword != ''">
+ AND (
+ t1.device_code LIKE CONCAT('%', #{keyword},'%')
+ OR t2.pole_name LIKE CONCAT('%', #{keyword},'%')
+ )
+ </if>
+
+ </where>
+ ORDER BY t1.light_report_data_id DESC
+ </select>
+ <select id="listReportDataByUserid" resultType="com.sandu.ximon.dao.bo.LightReportDataBo">
+ SELECT
+ t1.* ,t2.pole_name
+ FROM
+ light_report_data t1
+ LEFT JOIN pole_binding t2 ON t1.device_code = t2.device_code
+ AND t2.device_type = 0
+ LEFT JOIN pole t3 ON t3.id = t2.pole_id
+ <where>
+ 1 = 1
+
+ <if test="deviceCode != null and deviceCode != ''">
+ AND t1.device_code = #{deviceCode}
+ </if>
+ <if test="keyword != null and keyword != ''">
+ AND (
+ t1.device_code LIKE CONCAT('%', #{keyword},'%')
+ OR t2.pole_name LIKE CONCAT('%', #{keyword},'%')
+ )
+ </if>
+ <if test="userid != null">
+ AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
+ </if>
+
+ </where>
+ ORDER BY t1.light_report_data_id DESC
+ </select>
+ <select id="reportDataList" resultType="com.sandu.ximon.dao.bo.LightReportDataBo">
+
+ </select>
</mapper>
--
Gitblit v1.9.3