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/daoSe/SeClientMapper.java | 65 +++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java
index e3a16e1..f5eff16 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeClientMapper.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.pipIrrGlobal.voSe.VoClient;
-import com.dy.pipIrrGlobal.voSe.VoOperate;
+import com.dy.pipIrrGlobal.voSe.VoClientWechat;
+import com.dy.pipIrrGlobal.voSe.VoTermClient;
+import com.dy.pipIrrGlobal.voSt.VoCardUsage;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -46,6 +48,13 @@
Long getAreaCodeByNum(@Param("clientNum") String clientNum);
/**
+ * 鏍规嵁鍐滄埛缂栧彿鑾峰彇5绾ц鏀垮尯鍒掍覆areaCode锛岃ˉ鍗¤繃绋嬩腑寮�鏂板崱浣跨敤
+ * @param clientId
+ * @return
+ */
+ Long getAreaCodeById(@Param("clientId") Long clientId);
+
+ /**
* 鏍规嵁鍐滄埛缂栧彿鑾峰彇鍐滄埛ID
* @param clientNum
* @return
@@ -53,11 +62,18 @@
Long getClientIdByNum(@Param("clientNum") String clientNum);
/**
+ * 鏍规嵁鐢佃瘽鍙风爜鑾峰彇鍐滄埛ID
+ * @param phoneNumber
+ * @return
+ */
+ Long getClientIdByPhone(String phoneNumber);
+
+ /**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛璁板綍鏁�
* @param params
* @return
*/
- Long getRecordCount(Map<?, ?> params);
+ List<VoClient> getRecordCount(Map<?, ?> params);
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛鏁版嵁
@@ -93,23 +109,44 @@
List<Map<String, Object>> getWaterTypes();
/**
- * 鏍规嵁鎸囧畾鏉′欢鑾峰彇璐按姹囨�诲拰璐崱姹囨��
- * @param params 缁熻鏉′欢
- * @return 璐按閲戦銆佽喘鍗￠噾棰�
+ * 鑾峰彇鍐滄埛鍩烘湰淇℃伅锛屽皬绋嬪簭棣栭〉浣跨敤
+ * @param sessionId
+ * @return
*/
- Map getSums(Map<?, ?> params);
+ VoClientWechat getSimpleClientInfo(@Param("sessionId") Long sessionId, @Param("openId") String openId);
/**
- * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鎿嶄綔璁板綍鏁�
- * @param params 鏌ヨ鏉′欢
- * @return 绗﹀悎鏉′欢鐨勮褰曟暟
+ * 鑾峰彇鎸囧畾鏃堕棿娈靛啘鎴凤細鍏呭�煎悎璁°�佹秷璐瑰悎璁°�佷綑棰�
+ * @param params
+ * @return
*/
- Long getOperateRecordCount(Map<?, ?> params);
+ Long getClientUsagesCount(Map<String, Object> params);
/**
- * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鎿嶄綔璁板綍
- * @param params 鏌ヨ鏉′欢
- * @return 绗﹀悎鏉′欢鐨勪氦鏄撹褰�
+ * 鑾峰彇鎸囧畾鏃堕棿娈靛啘鎴凤細鍏呭�煎悎璁°�佹秷璐瑰悎璁°�佷綑棰�
+ * @param params
+ * @return
*/
- List<VoOperate> getOperates(Map<?, ?> params);
+ List<VoCardUsage> getClientUsages(Map<String, Object> params);
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛璁板綍鏁癬鍏呭�兼満
+ * @param params
+ * @return
+ */
+ Long getTermClientCount(Map<?, ?> params);
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇鍐滄埛鏁版嵁_鍏呭�兼満
+ * @param params
+ * @return
+ */
+ List<VoTermClient> getTermClients(Map<?, ?> params);
+
+ /**
+ * 鏍规嵁鍐滄埛ID鑾峰彇涓�涓啘鎴锋暟鎹甠鍏呭�兼満
+ * @param clientId
+ * @return
+ */
+ VoTermClient getTermOneClient(@Param("clientId") Long clientId);
}
\ No newline at end of file
--
Gitblit v1.8.0