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/Ar4BaseMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml
index bc3ec2b..8dacf70 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/Ar4BaseMapper.xml
@@ -2,18 +2,22 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dy.pipIrrGlobal.daoAllRound.Ar4BaseMapper">
- <select id="intakeInfo" resultType="com.dy.pipIrrGlobal.VoAllRound.VoArIntakeBase">
+ <select id="intakeInfo" resultType="com.dy.pipIrrGlobal.voAllRound.VoArIntakeBase">
select
itb.id as id,
itb.name as num,
itb.lng as lng,
itb.lat as lat,
+ CONCAT(county.name, town.name, village.name) as address,
bb.name as blockName,
pc.rtuAddr as rtuAddr
from pr_intake itb
LEFT JOIN ba_block bb on itb.blockId = bb.id
LEFT JOIN pr_controller pc on itb.id = pc.intakeId
- where id = #{intakeId,jdbcType=BIGINT}
+ LEFT JOIN ba_district county on itb.countyId = county.id
+ LEFT JOIN ba_district town on itb.townId = town.id
+ LEFT JOIN ba_district village on itb.villageId = village.id
+ where itb.id = #{intakeId,jdbcType=BIGINT}
</select>
<select id="intakeRtuAddr" resultType="java.lang.String">
--
Gitblit v1.8.0