From aa6debfa64d54cb68704a784e928d923e66f0eb8 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 28 十二月 2024 13:59:59 +0800
Subject: [PATCH] 临时任务完善

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml |   36 +++++++++++++++++++++++++++---------
 1 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
index 6fb51ff..53147f1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml
@@ -28,13 +28,14 @@
     <result column="alarm_battery_volt" jdbcType="TINYINT" property="alarmBatteryVolt" />
     <result column="alarm_valve" jdbcType="TINYINT" property="alarmValve" />
     <result column="power_type" jdbcType="TINYINT" property="alarmValve" />
+    <result column="send_ms_time" jdbcType="BIGINT" property="sendMsTime" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
     id, controller_id, intake_id, rtu_addr, dt, rtu_dt, valve_state, alarm_remain_water,
     alarm0_water_remain, alarm_exceed_year, alarm_water_meter_fault, alarm_loss, alarm_water_meter_break,
     alarm_ele_meter_fault, alarm0_money_remain, alarm_inner_door, alarm_outer_door, alarm_ele_miss, 
-    alarm_ele_exceed, alarm_ele_low_volt, state_ic_enable,alarm_battery_volt,alarm_valve,power_type
+    alarm_ele_exceed, alarm_ele_low_volt, state_ic_enable,alarm_battery_volt,alarm_valve,power_type,send_ms_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--@mbg.generated-->
@@ -64,7 +65,8 @@
       alarm_loss, alarm_water_meter_break, alarm_ele_meter_fault, 
       alarm0_money_remain, alarm_inner_door, alarm_outer_door, 
       alarm_ele_miss, alarm_ele_exceed, alarm_ele_low_volt, 
-      state_ic_enable,alarm_battery_volt,alarm_valve,power_type)
+      state_ic_enable,alarm_battery_volt,alarm_valve,power_type,
+      send_ms_time)
     values (#{id,jdbcType=BIGINT}, #{controllerId,jdbcType=BIGINT}, #{intakeId,jdbcType=BIGINT}, 
       #{rtuAddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{rtuDt,jdbcType=TIMESTAMP}, 
       #{valveState,jdbcType=TINYINT}, #{alarmRemainWater,jdbcType=TINYINT}, #{alarm0WaterRemain,jdbcType=TINYINT}, 
@@ -73,7 +75,7 @@
       #{alarm0MoneyRemain,jdbcType=TINYINT}, #{alarmInnerDoor,jdbcType=TINYINT}, #{alarmOuterDoor,jdbcType=TINYINT}, 
       #{alarmEleMiss,jdbcType=TINYINT}, #{alarmEleExceed,jdbcType=TINYINT}, #{alarmEleLowVolt,jdbcType=TINYINT},
       #{stateIcEnable,jdbcType=TINYINT}, #{alarmBatteryVolt,jdbcType=TINYINT}, #{alarmValve,jdbcType=TINYINT},
-      #{powerType,jdbcType=TINYINT})
+      #{powerType,jdbcType=TINYINT},#{sendMsTime,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast">
     <!--@mbg.generated-->
@@ -151,6 +153,9 @@
      <if test="powerType != null">
         power_type,
       </if>
+     <if test="sendMsTime != null">
+       send_ms_time,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -224,6 +229,9 @@
       </if>
      <if test="powerType != null">
         #{powerType,jdbcType=TINYINT},
+      </if>
+      <if test="sendMsTime != null">
+        #{sendMsTime,jdbcType=BIGINT},
       </if>
     </trim>
   </insert>
@@ -300,6 +308,9 @@
       <if test="powerType != null">
         power_type = #{powerType,jdbcType=TINYINT},
       </if>
+      <if test="sendMsTime != null">
+        send_ms_time = #{sendMsTime,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -328,7 +339,8 @@
       state_ic_enable = #{stateIcEnable,jdbcType=TINYINT},
       alarm_battery_volt = #{alarmBatteryVolt,jdbcType=TINYINT},
       alarm_valve = #{alarmValve,jdbcType=TINYINT},
-      power_type = #{powerType,jdbcType=TINYINT}
+      power_type = #{powerType,jdbcType=TINYINT},
+      send_ms_time = #{sendMsTime,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <!--鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍鎬绘暟-->
@@ -378,8 +390,11 @@
       <if test="valveState != null">
         and rasl.valve_state = #{valveState,jdbcType=TINYINT}
       </if>
-      <if test="intakeName != null">
-        and pint.name = #{intakeName,jdbcType=VARCHAR}
+      <if test="intakeId != null and intakeId != '' ">
+        and rash.intake_id = #{intakeId}
+      </if>
+      <if test="intakeName != null and intakeName != '' ">
+        and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">
         and rasl.dt &gt;= #{startDt,jdbcType=TIMESTAMP}
@@ -416,7 +431,7 @@
     rasl.alarm_valve as alarmValve,
     rasl.power_type as powerType
     from rm_alarm_state_last rasl
-    Left join pr_intake pint on intake_id = pint.id
+    Left join pr_intake pint on rasl.intake_id = pint.id
     <where>
       <if test="alarmState == 1">
         and (
@@ -459,7 +474,10 @@
       <if test="valveState != null">
         and rasl.valve_state = #{valveState,jdbcType=TINYINT}
       </if>
-      <if test="intakeName != null">
+      <if test="intakeId != null and intakeId != '' ">
+        and rash.intake_id = #{intakeId}
+      </if>
+      <if test="intakeName != null and intakeName != '' ">
         and pint.name like CONCAT('%',#{intakeName,jdbcType=VARCHAR},'%')
       </if>
       <if test="startDt != null">
@@ -469,7 +487,7 @@
         and rasl.dt &lt;= #{endDt,jdbcType=TIMESTAMP}
       </if>
     </where>
-    ORDER BY rasl.dt DESC
+    ORDER BY rasl.id DESC
     <if test="pageCurr != null and pageSize != null">
       LIMIT ${(pageCurr-1)*pageSize}, ${pageSize}
     </if>

--
Gitblit v1.8.0