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/RmSoilHistoryMapper.xml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml
index 4a66ef7..3e9eec7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/RmSoilHistoryMapper.xml
@@ -24,6 +24,13 @@
soil_humidity5, soil_temperature1, soil_temperature2, soil_temperature3, soil_temperature4,
soil_temperature5
</sql>
+ <sql id="Base_Column_List_with_alias">
+ <!--@mbg.generated-->
+ ${alias}.id, ${alias}.soil_id, ${alias}.dt, ${alias}.soil_humidity1,
+ ${alias}.soil_humidity2, ${alias}.soil_humidity3, ${alias}.soil_humidity4,
+ ${alias}.soil_humidity5, ${alias}.soil_temperature1, ${alias}.soil_temperature2,
+ ${alias}.soil_temperature3, ${alias}.soil_temperature4, ${alias}.soil_temperature5
+ </sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
@@ -31,6 +38,59 @@
from rm_soil_history
where id = #{id,jdbcType=BIGINT}
</select>
+ <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍鏁伴噺-->
+ <select id="selectCount" resultType="java.lang.Long">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM rm_soil_history htb
+ INNER JOIN pr_st_soil mtb ON mtb.id = htb.soil_id
+ <where>
+ <if test="soilId != null">
+ AND htb.soil_id = #{soilId}
+ </if>
+ <if test = "no != null">
+ AND mtb.no = #{no}
+ </if>
+ <if test = "name != null and name !=''">
+ AND mtb.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
+ AND htb.dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ </select>
+
+ <!--鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍-->
+ <select id="selectSome" resultType="com.dy.pipIrrGlobal.voRm.VoSoil">
+ SELECT
+ <include refid="Base_Column_List_with_alias" >
+ <property name="alias" value="htb"/>
+ </include>,
+ mtb.`name` AS soilName
+ FROM rm_soil_history htb
+ INNER JOIN pr_st_soil mtb ON mtb.id = htb.soil_id
+ <where>
+ <if test="soilId != null">
+ AND htb.soil_id = #{soilId}
+ </if>
+ <if test = "no != null">
+ AND mtb.no = #{no}
+ </if>
+ <if test = "name != null and name !=''">
+ AND mtb.name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test = "timeStart != null and timeStart !='' and timeStop != null and timeStop != ''">
+ AND htb.dt BETWEEN #{timeStart} AND #{timeStop}
+ </if>
+ </where>
+ ORDER BY htb.id DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from rm_soil_history
--
Gitblit v1.8.0