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/SeVirtualCardMapper.java | 61 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java
index 5680485..c4f0df8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSe/SeVirtualCardMapper.java
@@ -2,11 +2,15 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSe.SeVirtualCard;
+import com.dy.pipIrrGlobal.voSe.VoCardInfo1;
+import com.dy.pipIrrGlobal.voSe.VoVcRecharge;
import com.dy.pipIrrGlobal.voSe.VoVirtualCard;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @author ZhuBaoMin
@@ -41,12 +45,12 @@
* 鑾峰彇鍐滄埛鍏ㄩ儴铏氭嫙鍗�
* @return
*/
- List<VoVirtualCard> getVCs(@Param("clientId") Long clientId);
+ List<VoVirtualCard> getVCs(@Param("alarmValue") Integer alarmValue, @Param("clientId") Long clientId);
/**
* 鏍规嵁铏氭嫙鍗D鑾峰彇铏氭嫙鍗″璞�
- * @param vcId
- * @return
+ * @param vcId 铏氭嫙鍗D
+ * @return 铏氭嫙鍗″璞�
*/
VoVirtualCard getVcById(@Param("vcId") Long vcId);
@@ -56,6 +60,20 @@
* @return
*/
SeVirtualCard getVcCardByNum(@Param("vcNum") String vcNum);
+
+ /**
+ * 鏍规嵁铏氭嫙姘村崱缂栧彿鑾峰彇瀵瑰簲鐨勫啘鎴穒d鍜屽鍚�
+ * @param vcNum
+ * @return
+ */
+ Map getClientIdAndNameByVsCardNo(@Param("vcNum") Long vcNum);
+
+ /**
+ * 寰楀埌姘村崱瀵硅薄
+ * @param cardNum
+ * @return
+ */
+ List<VoCardInfo1> getCardsByNum(@Param("cardNum") Long cardNum);
/**
* 鏍规嵁铏氭嫙鍗＄紪鍙疯幏鍙栬櫄鎷熷崱ID
@@ -76,5 +94,40 @@
* @param intakeId
* @return
*/
- void updateVcCardNoUseStateByIntakeId(@Param("intakeId")Long intakeId) ;
+ void updateVcCardNoUseStateByIntakeId(@Param("intakeId")Long intakeId, @Param("now")Date now) ;
+
+ /**
+ * 鑾峰彇铏氭嫙鍗″厖鍊艰褰�
+ * @return
+ */
+ List<VoVcRecharge> getVcRechargeRecords(Map<?, ?> params);
+
+ /**
+ * 鑾峰彇铏氭嫙鍗″厖鍊艰褰曟暟
+ * @param params
+ * @return
+ */
+ Long getRechargeRecordCount(Map<?, ?> params);
+
+ /**
+ * 鏇存柊瀹炰綋鍗″墿浣欓噾棰�
+ * @param id
+ * @param money
+ */
+ void updateMoney(@Param("id")Long id , @Param("money")Double money);
+
+ /**
+ * 鏍规嵁鍐滄埛ID鍙婅櫄鎷熷崱ID鑾峰彇姝ｅ父鐘舵�佺殑铏氭嫙鍗″璞★紝閿�鍗′娇鐢�
+ * @param clientId
+ * @param vcId
+ * @return
+ */
+ SeVirtualCard getVcByClientIdAndVcId(@Param("clientId")Long clientId, @Param("vcId")Long vcId);
+
+ /**
+ * 娉ㄩ攢铏氭嫙鍗�
+ * @param vcId
+ * @return
+ */
+ Integer cancelVc(@Param("clientId")Long clientId, @Param("vcId")Long vcId);
}
\ No newline at end of file
--
Gitblit v1.8.0