From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 73 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java
index e42cbc0..7d6c964 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java
@@ -1,12 +1,15 @@
package com.dy.pipIrrStatistics.largeScreen;
import com.dy.common.aop.SsoAop;
+import com.dy.common.util.DateTime;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.voLargeScreen.VoBaseInfo;
import com.dy.pipIrrGlobal.voLargeScreen.VoCurrentInfo;
import com.dy.pipIrrGlobal.voLargeScreen.VoMonitorInfo;
+import com.dy.pipIrrGlobal.voSpecial.VoTopXClient;
+import com.dy.pipIrrGlobal.voSpecial.VoTopXIntake;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -21,6 +24,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
+import java.util.List;
/**
* @Author: liurunyu
@@ -62,6 +66,26 @@
return BaseResponseUtils.buildSuccess(res);
}
+ /**
+ * 澶у睆灞曠ず---鍩烘湰淇℃伅
+ * @return 鍩烘湰淇℃伅
+ */
+ @Operation(summary = "澶у睆灞曠ず", description = "鍩烘湰淇℃伅")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鍩烘湰淇℃伅锛圔aseResponse.content:VoBaseInfo{}锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoBaseInfo.class))}
+ )
+ })
+ @GetMapping(path = "basicInfo")
+ @SsoAop()
+ public BaseResponse<VoBaseInfo> basicInfo() {
+ VoBaseInfo res = this.sv.baseInfo();
+ return BaseResponseUtils.buildSuccess(res);
+ }
+
/**
* 澶у睆灞曠ず---褰撳墠淇℃伅
@@ -86,7 +110,7 @@
/**
* 澶у睆灞曠ず---鐩戞祴淇℃伅
* @return 鐩戞祴淇℃伅
- * @param startDt 寮�濮嬫棩鏈燂紙鏍煎紡 yyyy-mm-dd锛�
+ * @param fromDt 寮�濮嬫棩鏈燂紙鏍煎紡 yyyy-mm-dd锛�
*/
@Operation(summary = "澶у睆灞曠ず", description = "鐩戞祴淇℃伅")
@ApiResponses(value = {
@@ -99,9 +123,56 @@
})
@GetMapping(path = "monitorInfo")
@SsoAop()
- public BaseResponse<VoMonitorInfo> monitorInfo(Date startDt) {
+ public BaseResponse<VoMonitorInfo> monitorInfo(String fromDt) throws Exception {
+ if(fromDt == null || fromDt.trim().equals("")){
+ return BaseResponseUtils.buildException("寮�濮嬫棩鏈熶笉鑳戒负绌�");
+ }
+ Date startDt = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(fromDt + " 00:00:00");
VoMonitorInfo res = this.sv.monitorInfo(startDt);
return BaseResponseUtils.buildSuccess(res);
}
+
+
+ /**
+ * 鏄ㄦ棩鍐滄埛鐢ㄦ按鍓�5鍚�
+ * @return 鏁版嵁闆嗗悎
+ */
+ @Operation(summary = "鏄ㄦ棩鍐滄埛鐢ㄦ按鍓�5鍚�", description = "鏄ㄦ棩鍐滄埛鐢ㄦ按鍓�5鍚嶇粺璁�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鏄ㄦ棩鍐滄埛鐢ㄦ按鍓�5鍚嶇粺璁★紙BaseResponse.content:[VoTopXClient{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoTopXClient.class))}
+ )
+ })
+ @GetMapping(path = "top5ClientYesterday")
+ @SsoAop()
+ public BaseResponse<List<VoTopXClient>> top5ClientYesterday(){
+ List<VoTopXClient> res = this.sv.top5ClientYesterday();
+ return BaseResponseUtils.buildSuccess(res);
+ }
+
+ /**
+ * 鏄ㄦ棩鍙栨按鍙ｇ敤姘村墠5鍚�
+ * @return 鏁版嵁闆嗗悎
+ */
+ @Operation(summary = "鏄ㄦ棩鍙栨按鍙ｇ敤姘村墠5鍚�", description = "鏄ㄦ棩鍙栨按鍙ｇ敤姘村墠5鍚嶇粺璁�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "鏄ㄦ棩鍙栨按鍙ｇ敤姘村墠5鍚嶇粺璁★紙BaseResponse.content:[VoTopXIntake{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoTopXIntake.class))}
+ )
+ })
+ @GetMapping(path = "top5IntakeYesterday")
+ @SsoAop()
+ public BaseResponse<List<VoTopXIntake>> top5IntakeYesterday(){
+ List<VoTopXIntake> res = this.sv.top5IntakeYesterday();
+ return BaseResponseUtils.buildSuccess(res);
+ }
+
+
}
--
Gitblit v1.8.0