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/StClientAmountDayMapper.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountDayMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountDayMapper.java
index a6aba5e..8a8afea 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountDayMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StClientAmountDayMapper.java
@@ -1,10 +1,15 @@
package com.dy.pipIrrGlobal.daoSt;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoSt.StClientAmountDay;
+import com.dy.pipIrrGlobal.voSt.VoClientAmountStatistics;
+import com.dy.pipIrrGlobal.voSt.VoStClientAmountDay;
+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
@@ -12,7 +17,7 @@
* @Description
*/
@Mapper
-public interface StClientAmountDayMapper {
+public interface StClientAmountDayMapper extends BaseMapper<StClientAmountDay> {
/**
* delete by primary key
*
@@ -63,21 +68,45 @@
//////////////////////////////////////
+ //鏌ヨ缁熻缁撴灉
+ /**
+ * 鏌ヨ鎬绘暟閲�
+ * @param params
+ * @return
+ */
+ Long selectCountDayStatistics(Map<?, ?> params) ;
+
+ List<VoStClientIdAmountYearRecord> selectClientIds4DayStatistics(Map<?, ?> params) ;
+
+ /**
+ * 鏌ヨ鍒嗛〉鏁版嵁
+ * @param params
+ * @return
+ */
+ List<VoStClientAmountDay> selectDayStatistics(Map<?, ?> params) ;
+
+ //////////////////////////////////////
//缁熻鐩稿叧
/**
* 鏌ヨ鐢ㄦ按鎴蜂竴涓湀鎵�鏈夋棩鐨勭敤姘撮噺
- * @param clientId
* @param year
* @param month
* @return
*/
- List<StClientAmountDay> selectByClientIdAndYearAndMonthAndDay(@Param("clientId")Long clientId,
- @Param("year")Integer year,
- @Param("month")Integer month) ;
+ List<VoClientAmountStatistics> statisticsByClient(@Param("year")Integer year,
+ @Param("month")Integer month) ;
+
+ /**
+ * 鏌ヨ鐢ㄦ按鎴蜂竴涓湀鎵�鏈夋棩鐨勭敤姘撮噺
+ * @param year
+ * @param month
+ * @return
+ */
+ List<StClientAmountDay> selectByYearAndMonthAndDay(@Param("year")Integer year,
+ @Param("month")Integer month) ;
//////////////////////////////////////
//涓存椂浠诲姟鐩稿叧
-
/**
* 鍒犻櫎鍏ㄩ儴
* @return
--
Gitblit v1.8.0