From 7a30cb7329eb065d9a95213b327818412c2d5d0e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 03 三月 2025 14:22:22 +0800
Subject: [PATCH] 1、表阀一体机新协议解析优化； 2、取水口实体编辑更新逻辑修改，去除引起bug的代码。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 107 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
index d0dcde5..bbf7b56 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
@@ -10,14 +10,15 @@
<result column="startup_mode" jdbcType="TINYINT" property="startupMode" />
<result column="plan_start_time" jdbcType="TIMESTAMP" property="planStartTime" />
<result column="plan_stop_time" jdbcType="TIMESTAMP" property="planStopTime" />
+ <result column="duration" jdbcType="INTEGER" property="duration" />
<result column="plan_state" jdbcType="TINYINT" property="planState" />
<result column="executing_state" jdbcType="TINYINT" property="executingState" />
<result column="deleted" jdbcType="BIGINT" property="deleted" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, project_id, plan_name, startup_mode, plan_start_time, plan_stop_time, plan_state,
- executing_state, deleted
+ id, project_id, plan_name, startup_mode, plan_start_time, plan_stop_time, duration,
+ plan_state, executing_state, deleted
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
@@ -35,12 +36,12 @@
<!--@mbg.generated-->
insert into ir_irrigate_plan (id, project_id, plan_name,
startup_mode, plan_start_time, plan_stop_time,
- plan_state, executing_state, deleted
- )
+ duration, plan_state, executing_state,
+ deleted)
values (#{id,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{planName,jdbcType=VARCHAR},
#{startupMode,jdbcType=TINYINT}, #{planStartTime,jdbcType=TIMESTAMP}, #{planStopTime,jdbcType=TIMESTAMP},
- #{planState,jdbcType=TINYINT}, #{executingState,jdbcType=TINYINT}, #{deleted,jdbcType=BIGINT}
- )
+ #{duration,jdbcType=INTEGER}, #{planState,jdbcType=TINYINT}, #{executingState,jdbcType=TINYINT},
+ #{deleted,jdbcType=BIGINT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoIr.IrIrrigatePlan">
<!--@mbg.generated-->
@@ -63,6 +64,9 @@
</if>
<if test="planStopTime != null">
plan_stop_time,
+ </if>
+ <if test="duration != null">
+ duration,
</if>
<if test="planState != null">
plan_state,
@@ -92,6 +96,9 @@
</if>
<if test="planStopTime != null">
#{planStopTime,jdbcType=TIMESTAMP},
+ </if>
+ <if test="duration != null">
+ #{duration,jdbcType=INTEGER},
</if>
<if test="planState != null">
#{planState,jdbcType=TINYINT},
@@ -123,6 +130,9 @@
<if test="planStopTime != null">
plan_stop_time = #{planStopTime,jdbcType=TIMESTAMP},
</if>
+ <if test="duration != null">
+ duration = #{duration,jdbcType=INTEGER},
+ </if>
<if test="planState != null">
plan_state = #{planState,jdbcType=TINYINT},
</if>
@@ -143,6 +153,7 @@
startup_mode = #{startupMode,jdbcType=TINYINT},
plan_start_time = #{planStartTime,jdbcType=TIMESTAMP},
plan_stop_time = #{planStopTime,jdbcType=TIMESTAMP},
+ duration = #{duration,jdbcType=INTEGER},
plan_state = #{planState,jdbcType=TINYINT},
executing_state = #{executingState,jdbcType=TINYINT},
deleted = #{deleted,jdbcType=BIGINT}
@@ -153,4 +164,94 @@
<update id="publishIrrigatePlan">
UPDATE ir_irrigate_plan SET plan_state = 2 WHERE id = #{planId}
</update>
+
+ <!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栬鍒掓暟閲�-->
+ <select id="getIrrigatePlanCount" resultType="java.lang.Long">
+ SELECT COUNT(*)
+ FROM ir_irrigate_plan plan
+ INNER JOIN ir_project pro ON pro.id = plan.project_id
+ <where>
+ AND plan.deleted = 0
+ AND pro.deleted = 0
+ <if test="projectName != null and projectName != ''">
+ AND pro.project_name LIKE CONCAT('%', #{projectName}, '%')
+ </if>
+
+ <if test="planName != null and planName != ''">
+ AND plan.plan_name LIKE CONCAT('%', #{planName}, '%')
+ </if>
+
+ <if test="startupMode != null">
+ AND plan.startup_mode = #{startupMode}
+ </if>
+
+ <if test="planState != null">
+ AND plan.plan_state = #{planState}
+ </if>
+
+ <if test="executingState != null">
+ AND plan.executing_state = #{executingState}
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栬鍒掑垪琛�-->
+ <select id="getIrrigatePlans" resultType="com.dy.pipIrrGlobal.voIr.VoIrrigatePlan">
+ SELECT
+ plan.id AS planId,
+ pro.project_name AS projectName,
+ plan.plan_name AS planName,
+ CASE plan.startup_mode
+ WHEN 1 THEN '鎵嬪姩鍚姩'
+ WHEN 2 THEN '鑷姩鍚姩'
+ END AS startupMode,
+ plan.plan_start_time AS startTime,
+ plan.plan_stop_time AS stopTime,
+ CASE plan.plan_state
+ WHEN 1 THEN '鑽夌'
+ WHEN 2 THEN '宸插彂甯�'
+ END AS planState,
+
+ CASE plan.executing_state
+ WHEN 1 THEN
+ '鏈墽琛�'
+ WHEN 2 THEN
+ '鎵ц涓�'
+ WHEN 3 THEN
+ '宸叉殏鍋�'
+ WHEN 4 THEN
+ '宸茬粓姝�'
+ END AS executingState
+ FROM ir_irrigate_plan plan
+ INNER JOIN ir_project pro ON pro.id = plan.project_id
+ <where>
+ AND plan.deleted = 0
+ AND pro.deleted = 0
+ <if test="projectName != null and projectName != ''">
+ AND pro.project_name LIKE CONCAT('%', #{projectName}, '%')
+ </if>
+
+ <if test="planName != null and planName != ''">
+ AND plan.plan_name LIKE CONCAT('%', #{planName}, '%')
+ </if>
+
+ <if test="startupMode != null">
+ AND plan.startup_mode = #{startupMode}
+ </if>
+
+ <if test="planState != null">
+ AND plan.plan_state = #{planState}
+ </if>
+
+ <if test="executingState != null">
+ AND plan.executing_state = #{executingState}
+ </if>
+ </where>
+ ORDER BY plan.plan_state DESC, plan.plan_start_time
+ <trim prefix="limit ">
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0