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-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsCtrl.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 111 insertions(+), 0 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 fdd99cf..16c2df6 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
@@ -5,9 +5,15 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrGlobal.pojoMd.MdEt0;
import com.dy.pipIrrGlobal.voLargeScreen.VoBaseInfo;
import com.dy.pipIrrGlobal.voLargeScreen.VoCurrentInfo;
import com.dy.pipIrrGlobal.voLargeScreen.VoMonitorInfo;
+import com.dy.pipIrrGlobal.voMd.VoCrops;
+import com.dy.pipIrrGlobal.voMd.VoCropsSimple;
+import com.dy.pipIrrGlobal.voMd.VoEt0Simple;
+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;
@@ -22,6 +28,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
+import java.util.List;
/**
* @Author: liurunyu
@@ -59,6 +66,26 @@
@GetMapping(path = "baseInfo")
@SsoAop()
public BaseResponse<VoBaseInfo> baseInfo() {
+ VoBaseInfo res = this.sv.baseInfo();
+ 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);
}
@@ -109,4 +136,88 @@
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);
+ }
+
+
+ /**
+ * 寰楀埌鎵�鏈変綔鐗�
+ * @return 鏁版嵁闆嗗悎
+ */
+ @Operation(summary = "寰楀埌鎵�鏈変綔鐗�", description = "寰楀埌鎵�鏈変綔鐗�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "寰楀埌鎵�鏈変綔鐗╋紙BaseResponse.content:[VoTopXIntake{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoCropsSimple.class))}
+ )
+ })
+ @GetMapping(path = "allCropts")
+ @SsoAop()
+ public BaseResponse<List<VoCropsSimple>> allCropts(){
+ List<VoCropsSimple> res = this.sv.allCropts();
+ return BaseResponseUtils.buildSuccess(res);
+ }
+
+
+ /**
+ * 寰楀埌涓�涓綔鐗╀竴鍛ㄥ唴鐨勮捀鏁ｉ噺
+ * @return 鏁版嵁闆嗗悎
+ */
+ @Operation(summary = "涓�涓綔鐗╀竴鍛ㄥ唴鐨勮捀鏁ｉ噺", description = "涓�涓綔鐗╀竴鍛ㄥ唴鐨勮捀鏁ｉ噺")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "涓�涓綔鐗╀竴鍛ㄥ唴鐨勮捀鏁ｉ噺锛圔aseResponse.content:[VoTopXIntake{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoEt0Simple.class))}
+ )
+ })
+ @GetMapping(path = "et0InWeek")
+ @SsoAop()
+ public BaseResponse<List<VoEt0Simple>> et0InWeek(Long cropId){
+ List<VoEt0Simple> res = this.sv.et0InWeek(cropId);
+ return BaseResponseUtils.buildSuccess(res);
+ }
+
}
--
Gitblit v1.8.0