Merge remote-tracking branch 'origin/master'

wuzeyu

2024-05-06 dba2b8fa7830de783b698d22671d63bdf2de9521

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmAlarmStateLastMapper.xml

@@ -8,7 +8,8 @@
    <result column="controllerId" jdbcType="BIGINT" property="controllerid" />
    <result column="intakeId" jdbcType="BIGINT" property="intakeid" />
    <result column="rtuAddr" jdbcType="VARCHAR" property="rtuaddr" />
    <result column="dt" jdbcType="DATE" property="dt" />
    <result column="dt" jdbcType="TIMESTAMP" property="dt" />
    <result column="rtuDt" jdbcType="TIMESTAMP" property="rtudt" />
    <result column="bateryVolt" jdbcType="TINYINT" property="bateryvolt" />
    <result column="loss" jdbcType="TINYINT" property="loss" />
    <result column="meter" jdbcType="TINYINT" property="meter" />
@@ -19,7 +20,7 @@
  </resultMap>
  <sql id="Base_Column_List">
    <!--@mbg.generated-->
    id, controllerId, intakeId, rtuAddr, dt, bateryVolt, loss, meter, valve, icCard, 
    id, controllerId, intakeId, rtuAddr, dt, rtuDt, bateryVolt, loss, meter, valve, icCard,
    working, valveState
  </sql>
  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
@@ -46,12 +47,12 @@
  <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.RmAlarmStateLast">
    <!--@mbg.generated-->
    insert into rm_alarm_state_last (id, controllerId, intakeId, 
      rtuAddr, dt, bateryVolt, 
      rtuAddr, dt, rtuDt, bateryVolt,
      loss, meter, valve, 
      icCard, working, valveState
      )
    values (#{id,jdbcType=BIGINT}, #{controllerid,jdbcType=BIGINT}, #{intakeid,jdbcType=BIGINT}, 
      #{rtuaddr,jdbcType=VARCHAR}, #{dt,jdbcType=DATE}, #{bateryvolt,jdbcType=TINYINT}, 
      #{rtuaddr,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP}, #{rtudt,jdbcType=TIMESTAMP}, #{bateryvolt,jdbcType=TINYINT},
      #{loss,jdbcType=TINYINT}, #{meter,jdbcType=TINYINT}, #{valve,jdbcType=TINYINT}, 
      #{iccard,jdbcType=TINYINT}, #{working,jdbcType=TINYINT}, #{valvestate,jdbcType=TINYINT}
      )
@@ -74,6 +75,9 @@
      </if>
      <if test="dt != null">
        dt,
      </if>
      <if test="rtudt != null">
        rtuDt,
      </if>
      <if test="bateryvolt != null">
        bateryVolt,
@@ -111,7 +115,10 @@
        #{rtuaddr,jdbcType=VARCHAR},
      </if>
      <if test="dt != null">
        #{dt,jdbcType=DATE},
        #{dt,jdbcType=TIMESTAMP},
      </if>
      <if test="rtudt != null">
        #{rtudt,jdbcType=TIMESTAMP},
      </if>
      <if test="bateryvolt != null">
        #{bateryvolt,jdbcType=TINYINT},
@@ -150,7 +157,10 @@
        rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
      </if>
      <if test="dt != null">
        dt = #{dt,jdbcType=DATE},
        dt = #{dt,jdbcType=TIMESTAMP},
      </if>
      <if test="rtudt != null">
        rtuDt = #{rtudt,jdbcType=TIMESTAMP},
      </if>
      <if test="bateryvolt != null">
        bateryVolt = #{bateryvolt,jdbcType=TINYINT},
@@ -182,7 +192,8 @@
    set controllerId = #{controllerid,jdbcType=BIGINT},
      intakeId = #{intakeid,jdbcType=BIGINT},
      rtuAddr = #{rtuaddr,jdbcType=VARCHAR},
      dt = #{dt,jdbcType=DATE},
      dt = #{dt,jdbcType=TIMESTAMP},
      rtuDt = #{rtudt,jdbcType=TIMESTAMP},
      bateryVolt = #{bateryvolt,jdbcType=TINYINT},
      loss = #{loss,jdbcType=TINYINT},
      meter = #{meter,jdbcType=TINYINT},