From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒; 2、修改向水肥机下发命令相关逻辑; 3、修改水肥机回复命令结果处理逻辑; 4、去除前端webSocket关闭产生异常日志记录。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossYearMapper.xml |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossYearMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossYearMapper.xml
index 3013771..f0ae670 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossYearMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/StLossYearMapper.xml
@@ -20,6 +20,22 @@
     from st_loss_year
     where id = #{id,jdbcType=BIGINT}
   </select>
+
+  <select id="selectByIntakeIdAndYear" resultType="com.dy.pipIrrGlobal.pojoSt.StLossYear">
+    <!--@mbg.generated-->
+    select
+    <include refid="Base_Column_List" />
+    from st_loss_year
+    <where>
+      <if test="intakeId != null">
+        and intake_id = #{intakeId,jdbcType=BIGINT}
+      </if>
+      <if test="year != null">
+        and `year` = #{year,jdbcType=INTEGER}
+      </if>
+    </where>
+  </select>
+
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--@mbg.generated-->
     delete from st_loss_year

--
Gitblit v1.8.0