From 0a30812acaa26ebe654340f7e749a6801b63b194 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 21 十月 2022 16:32:36 +0800
Subject: [PATCH] changes
---
dao/src/main/resources/mapper/C3mChargingMapper.xml | 54 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 45 insertions(+), 9 deletions(-)
diff --git a/dao/src/main/resources/mapper/C3mChargingMapper.xml b/dao/src/main/resources/mapper/C3mChargingMapper.xml
index 87cf5a9..ea9ef97 100644
--- a/dao/src/main/resources/mapper/C3mChargingMapper.xml
+++ b/dao/src/main/resources/mapper/C3mChargingMapper.xml
@@ -5,18 +5,20 @@
<mapper namespace="com.sandu.ximon.dao.mapper.C3mChargingMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.C3mCharging">
- <id property="c3Id" column="c3_id" jdbcType="BIGINT"/>
- <result property="mcuUdid" column="mcu_udid" jdbcType="VARCHAR"/>
- <result property="c3Name" column="c3_name" jdbcType="VARCHAR"/>
- <result property="c3Mac" column="c3_mac" jdbcType="VARCHAR"/>
- <result property="statusBit" column="status_bit" jdbcType="INTEGER"/>
- <result property="deviceTemperature" column="device_temperature" jdbcType="VARCHAR"/>
- <result property="poleDevicesCode" column="pole_devices_code" jdbcType="VARCHAR"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <id property="c3Id" column="c3_id" jdbcType="BIGINT"/>
+ <result property="mcuUdid" column="mcu_udid" jdbcType="VARCHAR"/>
+ <result property="c3Name" column="c3_name" jdbcType="VARCHAR"/>
+ <result property="c3Mac" column="c3_mac" jdbcType="VARCHAR"/>
+ <result property="statusBit" column="status_bit" jdbcType="INTEGER"/>
+ <result property="deviceTemperature" column="device_temperature" jdbcType="VARCHAR"/>
+ <result property="poleDevicesCode" column="pole_devices_code" jdbcType="VARCHAR"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
</resultMap>
<sql id="Base_Column_List">
- c3_id,mcu_udid,c3_name,
+ c3_id
+ ,mcu_udid,c3_name,
c3_mac,status_bit,device_temperature,
pole_devices_code,update_time
</sql>
@@ -26,4 +28,38 @@
from c3m_charging
where c3_mac = #{c3Mac}
</select>
+ <select id="listC3mChargingDto" resultType="com.sandu.ximon.dao.bo.C3ChargingBo">
+ SELECT t1.*,
+ t3.id AS pole_id,
+ t3.pole_name
+ FROM c3m_charging t1
+ LEFT JOIN pole_binding t2 ON t1.mcu_udid = t2.device_code
+ AND t2.device_type = 2
+ LEFT JOIN pole t3 ON t3.id = t2.pole_id
+ <where>
+ <if test="keyword != null and keyword != ''">
+ AND (t1.c3_name LIKE CONCAT(CONCAT('%', #{keyword}), '%') OR (t3.pole_name LIKE CONCAT(CONCAT('%',
+ #{keyword}), '%')))
+ </if>
+ <if test="userid != null">
+ AND (t3.user_id = #{userid} OR t3.client_id = #{userid})
+ </if>
+ </where>
+ ORDER BY ${orderBy}
+ </select>
</mapper>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--
Gitblit v1.9.3