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/StConsumeClientDayMapper.java |   90 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 90 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientDayMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientDayMapper.java
new file mode 100644
index 0000000..8dbdf85
--- /dev/null
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoSt/StConsumeClientDayMapper.java
@@ -0,0 +1,90 @@
+package com.dy.pipIrrGlobal.daoSt;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dy.pipIrrGlobal.pojoSt.StConsumeClientDay;
+import com.dy.pipIrrGlobal.voSt.VoClientConsumeStatistics;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @Author: liurunyu
+ * @Date: 2024/12/25 18:08
+ * @Description
+ */
+@Mapper
+public interface StConsumeClientDayMapper extends BaseMapper<StConsumeClientDay> {
+    /**
+     * delete by primary key
+     *
+     * @param id primaryKey
+     * @return deleteCount
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * insert record to table
+     *
+     * @param record the record
+     * @return insert count
+     */
+    int insert(StConsumeClientDay record);
+
+    /**
+     * insert record to table selective
+     *
+     * @param record the record
+     * @return insert count
+     */
+    int insertSelective(StConsumeClientDay record);
+
+    /**
+     * select by primary key
+     *
+     * @param id primary key
+     * @return object by primary key
+     */
+    StConsumeClientDay selectByPrimaryKey(Long id);
+
+    /**
+     * update record selective
+     *
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKeySelective(StConsumeClientDay record);
+
+    /**
+     * update record
+     *
+     * @param record the updated record
+     * @return update count
+     */
+    int updateByPrimaryKey(StConsumeClientDay record);
+
+
+    /////////////////////////////////////////////////////
+    //缁熻鐩稿叧
+    /**
+     * 鎸囧畾骞存寚瀹氭湀鐨勫悇鍐滄埛缁熻
+     *
+     * @param year
+     * @param month
+     * @return
+     */
+    List<VoClientConsumeStatistics> statisticsByClient(@Param("year") Integer year, @Param("month") Integer month);
+
+    /**
+     * 鏌ヨ鎸囧畾鍐滄埛鎸囧畾骞存寚瀹氭湀鐨勫悇鏃ョ粺璁�
+     *
+     * @param clientId
+     * @param year
+     * @param month
+     * @return
+     */
+    List<StConsumeClientDay> selectByClientAndYearAndMonth(@Param("clientId") Long clientId,
+                                                      @Param("year") Integer year,
+                                                      @Param("month") Integer month);
+
+}
\ No newline at end of file

--
Gitblit v1.8.0