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/daoSt/StClientAmountYearMapper.java | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountYearMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountYearMapper.java
index e75f9a5..7277306 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountYearMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountYearMapper.java
@@ -1,22 +1,24 @@
package com.dy.pipIrrGlobal.daoSt;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StClientAmountYear;
-import com.dy.pipIrrGlobal.pojoSt.StIntakeAmountYear;
+import com.dy.pipIrrGlobal.voSt.VoStClientAmountYearRecord;
+import com.dy.pipIrrGlobal.voSt.VoStClientIdAmountYearRecord;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
+import java.util.Map;
/**
* @Author: liurunyu
- * @Date: 2024/7/24 17:03
+ * @Date: 2024/12/30 9:21
* @Description
*/
@Mapper
-public interface StClientAmountYearMapper extends BaseMapper<StClientAmountYear> {
+public interface StClientAmountYearMapper {
/**
* delete by primary key
+ *
* @param id primaryKey
* @return deleteCount
*/
@@ -24,6 +26,7 @@
/**
* insert record to table
+ *
* @param record the record
* @return insert count
*/
@@ -31,6 +34,7 @@
/**
* insert record to table selective
+ *
* @param record the record
* @return insert count
*/
@@ -38,21 +42,15 @@
/**
* select by primary key
+ *
* @param id primary key
* @return object by primary key
*/
StClientAmountYear selectByPrimaryKey(Long id);
/**
- * 鏌ヨ鏌愬勾鏌愬彇姘村彛鐨勫勾鏌愰噺鍊�
- * @param clientId 鍐滄埛ID
- * @param year 鏌愬勾
- * @return
- */
- List<StClientAmountYear> selectByClientIdAndYear(@Param("clientId")Long clientId, @Param("year")Integer year) ;
-
- /**
* update record selective
+ *
* @param record the updated record
* @return update count
*/
@@ -60,8 +58,42 @@
/**
* update record
+ *
* @param record the updated record
* @return update count
*/
int updateByPrimaryKey(StClientAmountYear record);
+
+
+
+ //////////////////////////////////////
+ //鏌ヨ缁熻缁撴灉
+ /**
+ * 鏌ヨ鎬绘暟閲�
+ * @param params
+ * @return
+ */
+ Long selectCountYearStatistics(Map<?, ?> params) ;
+
+ List<VoStClientIdAmountYearRecord> selectClientIds4YearStatistics(Map<?, ?> params) ;
+ /**
+ * 鏌ヨ鍒嗛〉鏁版嵁
+ * @param params
+ * @return
+ */
+ List<VoStClientAmountYearRecord> selectYearStatistics(Map<?, ?> params) ;
+
+ //////////////////////////////////////
+ //缁熻鐩稿叧
+ /**
+ * 鏌ヨ鏌愬勾 鏌愰噺鍊�
+ *
+ * @param year 鏌愬勾
+ * @return
+ */
+ List<StClientAmountYear> selectByYear(@Param("year") Integer year);
+
+ /////////////////////////////////////
+ //涓存椂浠诲姟
+ int deleteAll() ;
}
\ No newline at end of file
--
Gitblit v1.8.0