From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 21 二月 2025 09:52:14 +0800
Subject: [PATCH] 针对王江海制定的协议： 1、优化相关注释； 2、优化代码； 3、协议中报警信息有变化：外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuProgramMapper.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuProgramMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuProgramMapper.xml
index b281fdb..bae70d5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuProgramMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/UgRtuProgramMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoRm.UgRtuProgramMapper">
- <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
+ <resultMap id="BaseResultMap" type="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
<!--@mbg.generated-->
<!--@Table ug_rtu_program-->
<id column="id" jdbcType="BIGINT" property="id" />
@@ -74,6 +74,17 @@
where bd.deleted != 1
order by bd.id DESC
</select>
+ <select id="selectByFileName" parameterType="java.lang.String" resultType="java.lang.Long">
+ select
+ count(*)
+ from ug_rtu_program bd
+ where bd.deleted != 1
+ <trim prefix="and" suffixOverrides="and">
+ <if test="programFileName != null and programFileName != ''">
+ bd.hex_file_name = #{programFileName ,jdbcType=VARCHAR}
+ </if>
+ </trim>
+ </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
@@ -85,7 +96,7 @@
update ug_rtu_program set deleted = 1
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
+ <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
<!--@mbg.generated-->
insert into ug_rtu_program (id, hex_file_name, store_ram_addr,
start_ram_addr, program_calculate_bytes, program_crc16,
@@ -96,7 +107,7 @@
#{programBytes,jdbcType=BLOB}, #{fileBytes,jdbcType=BLOB}, #{remark,jdbcType=VARCHAR}, #{dt,jdbcType=TIMESTAMP},
#{deleted,jdbcType=TINYINT})
</insert>
- <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
+ <insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
<!--@mbg.generated-->
insert into ug_rtu_program
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -170,7 +181,7 @@
</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
<!--@mbg.generated-->
update ug_rtu_program
<set>
@@ -207,7 +218,7 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoRm.UgRtuProgram">
+ <update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoUg.UgRtuProgram">
<!--@mbg.generated-->
update ug_rtu_program
set hex_file_name = #{hexFileName,jdbcType=VARCHAR},
--
Gitblit v1.8.0