From 2f3d783999935f06228705e75fac26ebf099bf87 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 15 四月 2022 18:02:14 +0800
Subject: [PATCH] fix
---
dao/src/main/resources/mapper/LightReportDataMapper.xml | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/dao/src/main/resources/mapper/LightReportDataMapper.xml b/dao/src/main/resources/mapper/LightReportDataMapper.xml
index b1456bd..97db43a 100644
--- a/dao/src/main/resources/mapper/LightReportDataMapper.xml
+++ b/dao/src/main/resources/mapper/LightReportDataMapper.xml
@@ -5,22 +5,22 @@
<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="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="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="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
<resultMap id="listReportData" type="com.sandu.ximon.dao.bo.LightReportDataBo" extends="BaseResultMap">
@@ -46,10 +46,10 @@
</select>
<select id="listReportData" resultMap="listReportData">
SELECT
- t1.* ,t2.pole_name
+ t1.* ,t2.pole_name
FROM
- light_report_data t1
- LEFT JOIN pole t2 USING ( device_code )
+ light_report_data t1
+ LEFT JOIN pole t2 USING ( device_code )
<where>
1 = 1
@@ -66,4 +66,31 @@
</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>
</mapper>
--
Gitblit v1.9.3