From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java
index 3b3cd14..a934457 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/RmIntakeAmountDayMapper.java
@@ -2,12 +2,16 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDay;
-import com.dy.pipIrrGlobal.pojoRm.RmLossHistory;
-import com.dy.pipIrrGlobal.pojoRm.RmOnHourReportHistory;
+import com.dy.pipIrrGlobal.voRm.VoIntakeAmountDay;
+import com.dy.pipIrrGlobal.voSt.VoDayIntakeAmount;
+import com.dy.pipIrrGlobal.voSt.VoIntakeAmountStatistics;
+import com.dy.pipIrrGlobal.voSt.VoMonthAmount;
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: liurunyu
@@ -64,4 +68,55 @@
* @return update count
*/
int updateByPrimaryKey(RmIntakeAmountDay record);
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍鎬绘暟
+ * @param params
+ * @return
+ */
+ Long getRecordCount(Map<?, ?> params);
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢鑾峰彇璁板綍
+ * @param params
+ * @return
+ */
+ List<VoIntakeAmountDay> getIntakeAmountDayHistory(Map<?, ?> params);
+
+
+ /**
+ * 浠ュ彇姘村彛缁村害缁熻鍙栨按鍙ｅ彇姘撮噺
+ * @param statisticsStartId 缁熻鏃堕棿娈靛紑濮嬫椂闂村搴旂殑ID
+ * @param statisticsEndId 缁熻鏃堕棿娈垫埅姝㈡椂闂村搴旂殑ID
+ * @return
+ */
+ List<VoIntakeAmountStatistics> statisticsByIntake(@Param("startId")Long statisticsStartId, @Param("endId")Long statisticsEndId) ;
+
+ /**
+ * 鎸囧畾鏈堜唤鍚勫ぉ鐢ㄦ按閲忚褰曟暟閲�
+ * @param params
+ * @return
+ */
+ Long getDayIntakeAmountCount(Map<?, ?> params);
+
+ /**
+ * 缁熻鎸囧畾鏈堜唤鍚勫ぉ鐢ㄦ按閲�
+ * @param params
+ * @return
+ */
+ List<VoDayIntakeAmount> getDayIntakeAmount(Map<?, ?> params);
+
+ /**
+ * 缁熻鎸囧畾骞翠唤鍚勬湀鐢ㄦ按閲忚褰曟暟閲�
+ * @param params
+ * @return
+ */
+ Long getMonthIntakeAmountCount(Map<?, ?> params);
+
+ /**
+ * 缁熻鎸囧畾骞翠唤鍚勬湀鐢ㄦ按閲�
+ * @param params
+ * @return
+ */
+ List<VoMonthAmount> getMonthIntakeAmount(Map<?, ?> params);
}
\ No newline at end of file
--
Gitblit v1.8.0