PCS开关机相关配置不在数据表维护
This commit is contained in:
@ -64,11 +64,6 @@
|
||||
<result property="module2Temp" column="module2_temp" />
|
||||
<result property="module3Temp" column="module3_temp" />
|
||||
<result property="module4Temp" column="module4_temp" />
|
||||
<result property="clusterNum" column="cluster_num" />
|
||||
<result property="cluster1ActivePower" column="cluster1_active_power" />
|
||||
<result property="cluster2ActivePower" column="cluster2_active_power" />
|
||||
<result property="cluster3ActivePower" column="cluster3_active_power" />
|
||||
<result property="cluster4ActivePower" column="cluster4_active_power" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectEmsPcsDataVo">
|
||||
@ -80,7 +75,7 @@
|
||||
ac_capacitive_reactive_power, ac_discharge_active_power, ac_inductive_reactive_power, max_capacitive_power_capacity,
|
||||
max_inductive_power_capacity, max_charge_power_capacity, max_discharge_power_capacity, ac_switch_status, dc_switch_status,
|
||||
remote_control_status, sys_u_current, sys_v_current, sys_w_current, dw_frequency, u_temperature, v_temperature, w_temperature,
|
||||
module1_temp, module2_temp, module3_temp, module4_temp, cluster_num, cluster1_active_power, cluster2_active_power, cluster3_active_power, cluster4_active_power from ems_pcs_data
|
||||
module1_temp, module2_temp, module3_temp, module4_temp from ems_pcs_data
|
||||
</sql>
|
||||
|
||||
<select id="selectEmsPcsDataList" parameterType="EmsPcsData" resultMap="EmsPcsDataResult">
|
||||
@ -139,11 +134,6 @@
|
||||
<if test="module2Temp != null "> and module2_temp = #{module2Temp}</if>
|
||||
<if test="module3Temp != null "> and module3_temp = #{module3Temp}</if>
|
||||
<if test="module4Temp != null "> and module4_temp = #{module4Temp}</if>
|
||||
<if test="clusterNum != null "> and cluster_num = #{clusterNum}</if>
|
||||
<if test="cluster1ActivePower != null "> and cluster1_active_power = #{cluster1ActivePower}</if>
|
||||
<if test="cluster2ActivePower != null "> and cluster2_active_power = #{cluster2ActivePower}</if>
|
||||
<if test="cluster3ActivePower != null "> and cluster3_active_power = #{cluster3ActivePower}</if>
|
||||
<if test="cluster4ActivePower != null "> and cluster4_active_power = #{cluster4ActivePower}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
@ -213,11 +203,6 @@
|
||||
<if test="module2Temp != null">module2_temp,</if>
|
||||
<if test="module3Temp != null">module3_temp,</if>
|
||||
<if test="module4Temp != null">module4_temp,</if>
|
||||
<if test="clusterNum != null">cluster_num,</if>
|
||||
<if test="cluster1ActivePower != null">cluster1_active_power,</if>
|
||||
<if test="cluster2ActivePower != null">cluster2_active_power,</if>
|
||||
<if test="cluster3ActivePower != null">cluster3_active_power,</if>
|
||||
<if test="cluster4ActivePower != null">cluster4_active_power,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="dataUpdateTime != null">#{dataUpdateTime},</if>
|
||||
@ -278,11 +263,6 @@
|
||||
<if test="module2Temp != null">#{module2Temp},</if>
|
||||
<if test="module3Temp != null">#{module3Temp},</if>
|
||||
<if test="module4Temp != null">#{module4Temp},</if>
|
||||
<if test="clusterNum != null">#{clusterNum},</if>
|
||||
<if test="cluster1ActivePower != null">#{cluster1ActivePower},</if>
|
||||
<if test="cluster2ActivePower != null">#{cluster2ActivePower},</if>
|
||||
<if test="cluster3ActivePower != null">#{cluster3ActivePower},</if>
|
||||
<if test="cluster4ActivePower != null">#{cluster4ActivePower},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
@ -347,11 +327,6 @@
|
||||
<if test="module2Temp != null">module2_temp = #{module2Temp},</if>
|
||||
<if test="module3Temp != null">module3_temp = #{module3Temp},</if>
|
||||
<if test="module4Temp != null">module4_temp = #{module4Temp},</if>
|
||||
<if test="clusterNum != null">cluster_num = #{clusterNum},</if>
|
||||
<if test="cluster1ActivePower != null">cluster1_active_power = #{cluster1ActivePower},</if>
|
||||
<if test="cluster2ActivePower != null">cluster2_active_power = #{cluster2ActivePower},</if>
|
||||
<if test="cluster3ActivePower != null">cluster3_active_power = #{cluster3ActivePower},</if>
|
||||
<if test="cluster4ActivePower != null">cluster4_active_power = #{cluster4ActivePower},</if>
|
||||
</trim>
|
||||
where id = #{id}
|
||||
</update>
|
||||
@ -655,20 +630,4 @@
|
||||
group by deviceId,dateDay,createDate,temp
|
||||
order by dateDay,createDate
|
||||
</select>
|
||||
<select id="getSitePcsDataInfo" resultType="com.xzzn.ems.domain.EmsPcsData">
|
||||
select
|
||||
t.device_id as deviceId,
|
||||
t.site_id as siteId,
|
||||
t.cluster_num as clusterNum
|
||||
from ems_pcs_data t
|
||||
INNER JOIN (
|
||||
select p.site_id, p.device_id, MAX(p.create_time) as max_time
|
||||
from ems_pcs_data p
|
||||
where p.site_id = #{siteId}
|
||||
group by p.site_id, p.device_id
|
||||
) latest on t.site_id = latest.site_id
|
||||
and t.device_id = latest.device_id
|
||||
and t.create_time = latest.max_time
|
||||
where t.site_id = #{siteId}
|
||||
</select>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user