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/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java
index 8e4a570..b7a48f5 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoBa/BaBlockMapper.java
@@ -2,10 +2,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoBa.BaBlock;
-import com.dy.pipIrrGlobal.pojoBa.BaClientType;
-import com.dy.pipIrrGlobal.pojoBa.BaPrivilege;
+import com.dy.pipIrrGlobal.voBa.VoBlock;
+import com.dy.pipIrrGlobal.voBa.VoMapCoordinates;
+import com.dy.pipIrrGlobal.voBa.VoMapGraph;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -43,11 +43,39 @@
List<BaBlock> selectSome(Map<?, ?> params) ;
/**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鐗囧尯璁板綍鏁伴噺
+ * @param params
+ * @return
+ */
+ Long getBlocksCount(Map<?, ?> params) ;
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鐗囧尯
+ * @param params
+ * @return
+ */
+ List<VoBlock> getBlocks(Map<?, ?> params) ;
+
+ /**
+ * 鏍规嵁鐗囧尯ID鑾峰彇鍦板浘鍥惧舰鍒楄〃
+ * @param blockId
+ * @return
+ */
+ List<VoMapGraph> gertMapGraphsByBlockId(Long blockId);
+
+ /**
+ * 鏍规嵁鍦板浘鍥惧舰ID鑾峰彇鍦板浘鍥惧舰鍧愭爣鍒楄〃
+ * @param graphId
+ * @return
+ */
+ List<VoMapCoordinates> getCoordinatesByGraphId(Long graphId);
+
+ /**
* insert record to table
* @param record the record
* @return insert count
*/
- int insert(BaBlock record);
+ int putin(BaBlock record);
/**
* insert record to table selective
--
Gitblit v1.8.0