From 44eb64bef08ce231ac95d5ee482b046014dc8afa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 九月 2025 11:29:26 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java
index c5a7395..c57dc04 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/vapor/VaporCtrl.java
@@ -6,7 +6,6 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoMd.MdEt0;
-import com.dy.pipIrrGlobal.voRm.VoManure;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -20,6 +19,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -28,7 +28,7 @@
* @Description
*/
@Slf4j
-@Tag(name = "浣滅墿鏃ヨ捀鑵鹃噺", description = "浣滅墿鏃ヨ捀鑵鹃噺鏌ヨ绛夋搷浣�")
+@Tag(name = "浣滅墿鏃ヨ捀鏁ｉ噺", description = "浣滅墿鏃ヨ捀鏁ｉ噺鏌ヨ绛夋搷浣�")
@RestController
@RequestMapping(path = "mdVapor")
public class VaporCtrl {
@@ -40,14 +40,14 @@
/**
- * 瀹㈡埛绔姹傚緱鍒版墍鏈変綔鐗╃殑鏄ㄦ棩钂歌吘閲�
- * @return 鎵�鏈夋墍鏈変綔鐗╃殑鏄ㄦ棩钂歌吘閲�
+ * 瀹㈡埛绔姹傚緱鍒版墍鏈変綔鐗╃殑鏄ㄦ棩钂告暎閲�
+ * @return 鎵�鏈夋墍鏈変綔鐗╃殑鏄ㄦ棩钂告暎閲�
*/
- @Operation(summary = "鑾峰緱浣滅墿鐨勬槰鏃ヨ捀鑵鹃噺", description = "杩斿洖鎵�鏈変綔鐗╃殑鏄ㄦ棩钂歌吘閲忔暟鎹�")
+ @Operation(summary = "鑾峰緱浣滅墿鐨勬槰鏃ヨ捀鏁ｉ噺", description = "杩斿洖鎵�鏈変綔鐗╃殑鏄ㄦ棩钂告暎閲忔暟鎹�")
@ApiResponses(value = {
@ApiResponse(
responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
- description = "杩斿洖浣滅墿鐨勬槰鏃ヨ捀鑵鹃噺鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
+ description = "杩斿洖浣滅墿鐨勬槰鏃ヨ捀鏁ｉ噺鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
schema = @Schema(implementation = MdEt0.class))}
)
@@ -63,19 +63,19 @@
List<MdEt0> res = this.sv.selectEt0(ymd) ;
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
- log.error("鏌ヨ鎵�鏈変綔鐗╃殑鏄ㄦ棩钂歌吘閲忓紓甯�", e);
+ log.error("鏌ヨ鎵�鏈変綔鐗╃殑鏄ㄦ棩钂告暎閲忓紓甯�", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
/**
- * 鏍规嵁鎸囧畾鏉′欢浣滅墿鏌ヨ涓�娈垫椂闂村唴鐨勮捀鑵鹃噺
+ * 鏍规嵁鎸囧畾鏉′欢浣滅墿鏌ヨ涓�娈垫椂闂村唴鐨勮捀鏁ｉ噺
* @param qo
* @return
*/
@GetMapping(path = "oneCropsSomeEt0")
@SsoAop()
- public BaseResponse<List<VoManure>> oneCropsSomeEt0(VaporQo qo){
+ public BaseResponse<List<MdEt0>> oneCropsSomeEt0(VaporQo qo){
try {
if(qo.cropId == null){
return BaseResponseUtils.buildFail("浣滅墿id涓嶈兘涓虹┖") ;
@@ -86,7 +86,11 @@
if(qo.timeStart == null || qo.timeStart.trim().equals("")){
qo.timeStart = DateTime.lastXDay_yyyy_MM_dd(qo.timeStop, 10);
}
- return BaseResponseUtils.buildSuccess(sv.oneCropsSomeEt0(qo));
+ List<MdEt0> list = sv.oneCropsSomeEt0(qo) ;
+ if(list == null){
+ list = new ArrayList<>() ;
+ }
+ return BaseResponseUtils.buildSuccess(list);
} catch (Exception e) {
return BaseResponseUtils.buildException(e.getMessage()) ;
}
--
Gitblit v1.8.0