From d502caad139eb06678c89a281bf63dbc19adb228 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 26 六月 2025 09:54:21 +0800
Subject: [PATCH] 水肥机、墒情站、气象站历史数据、最新数据查询

---
 pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java |   40 ++++++++++++++++++++++++++++++++--------
 1 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java
index 609c9fd..5ea1a61 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/mqttSd1/manure/ManureSv.java
@@ -28,14 +28,17 @@
     @Autowired
     private RmManureLastMapper rmManureLastDao ;
 
-    /**
-     * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍
-     * @param qo
-     * @return
-     */
-    public QueryResultVo<List<VoManure>> selectHistory(ManureQo qo) {
-        qo.completionTime();
+    public VoManure oneLast(Long manureId) {
+        List<VoManure> list = this.rmManureLastDao.selectSomeByManureId(manureId) ;
+        if(list != null && list.size() > 0) {
+            return list.get(0) ;
+        }
+        return null ;
+    }
 
+    public QueryResultVo<List<VoManure>> oneHistory(Long manureId) {
+        ManureQo qo = new ManureQo() ;
+        qo.manureId = manureId ;
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
         Long itemTotal = rmManureHistoryDao.selectCount(params);
 
@@ -53,7 +56,7 @@
      * @param qo
      * @return
      */
-    public QueryResultVo<List<VoManure>> selectLast(ManureQo qo) {
+    public QueryResultVo<List<VoManure>> someLast(ManureQo qo) {
         qo.completionTime();
 
         Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
@@ -67,4 +70,25 @@
         rsVo.obj = rmManureLastDao.selectSome(params);
         return rsVo ;
     }
+
+    /**
+     * 鏍规嵁鎸囧畾鏉′欢鏌ヨ鍘嗗彶璁板綍
+     * @param qo
+     * @return
+     */
+    public QueryResultVo<List<VoManure>> someHistory(ManureQo qo) {
+        qo.completionTime();
+
+        Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+        Long itemTotal = rmManureHistoryDao.selectCount(params);
+
+        QueryResultVo<List<VoManure>> rsVo = new QueryResultVo<>() ;
+        rsVo.pageSize = qo.pageSize ;
+        rsVo.pageCurr = qo.pageCurr ;
+
+        rsVo.calculateAndSet(itemTotal, params);
+        rsVo.obj = rmManureHistoryDao.selectSome(params);
+        return rsVo ;
+    }
+
 }

--
Gitblit v1.8.0