From 459af817d6a4f916d2c2d247931452d8618b2d40 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 24 六月 2025 17:53:16 +0800
Subject: [PATCH] 1、水肥机分页查询功能实现; 2、气象站分页查询功能实现; 3、墒情站分页查询功能实现;

---
 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/soil/SoilCtrl.java |   34 +++++++++++++++++++++++++++++++---
 1 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/soil/SoilCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/soil/SoilCtrl.java
index 7386c4f..0adc5d2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/soil/SoilCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/mqtt/soil/SoilCtrl.java
@@ -3,8 +3,11 @@
 import com.dy.common.aop.SsoAop;
 import com.dy.common.webUtil.BaseResponse;
 import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryResultVo;
 import com.dy.common.webUtil.ResultCodeMsg;
 import com.dy.pipIrrGlobal.pojoPr.PrStSoil;
+import com.dy.pipIrrGlobal.voPr.VoSoil;
+import com.dy.pipIrrProject.mqtt.manure.QueryVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -19,6 +22,7 @@
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -39,6 +43,30 @@
         this.sv = sv ;
     }
 
+    /**
+     * 鍒嗛〉鏌ヨ澧掓儏绔欒褰�
+     * @param vo
+     * @return
+     */
+    @Operation(summary = "鑾峰緱涓�椤靛鎯呯珯璁板綍", description = "杩斿洖涓�椤靛鎯呯珯鏁版嵁")
+    @ApiResponses(value = {
+            @ApiResponse(
+                    responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+                    description = "杩斿洖涓�椤靛鎯呯珯鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
+                    content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+                            schema = @Schema(implementation = VoSoil.class))}
+            )
+    })
+    @GetMapping(path = "/some")
+    @SsoAop()
+    public BaseResponse<QueryResultVo<List<VoSoil>>> some(QueryVo vo){
+        try {
+            return BaseResponseUtils.buildSuccess(this.sv.selectSome(vo));
+        } catch (Exception e) {
+            log.error("鑾峰彇澧掓儏绔欒褰曞紓甯�", e);
+            return BaseResponseUtils.buildException(e.getMessage()) ;
+        }
+    }
 
     /**
      * 寰楀埌涓�濂楀鎯呯珯鏁版嵁
@@ -50,13 +78,13 @@
                     responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
                     description = "杩斿洖涓�濂楀鎯呯珯鏁版嵁锛圔aseResponse.content:{}锛�",
                     content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
-                            schema = @Schema(implementation = PrStSoil.class))}
+                            schema = @Schema(implementation = VoSoil.class))}
             )
     })
     @GetMapping(path = "one")
     @SsoAop()
-    public BaseResponse<PrStSoil> one(Long id){
-        return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
+    public BaseResponse<VoSoil> one(Long id){
+        return BaseResponseUtils.buildSuccess(this.sv.selectOne(id));
     }
 
     /**

--
Gitblit v1.8.0