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/special/SpecialCtrl.java | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialCtrl.java index 8fbe0a8..0c5cdcf 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialCtrl.java @@ -5,6 +5,7 @@ import com.dy.common.webUtil.BaseResponseUtils; import com.dy.common.webUtil.QueryResultVo; import com.dy.common.webUtil.ResultCodeMsg; +import com.dy.pipIrrGlobal.voSpecial.VoAbnormalCloseValve; import com.dy.pipIrrGlobal.voSpecial.VoSteal; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -27,7 +28,7 @@ /** * @Author: liurunyu * @Date: 2025/2/7 13:52 - * @Description 涓撻噺缁熻 + * @Description 涓撻缁熻 */ @Slf4j @Tag(name = "涓撻缁熻", description = "涓撻缁熻") @@ -46,7 +47,7 @@ /** * 娑夊珜鍋锋按 - * @return + * @return 鏁版嵁闆嗗悎 */ @Operation(summary = "娑夊珜鍋锋按", description = "娑夊珜鍋锋按缁熻") @ApiResponses(value = { @@ -67,4 +68,29 @@ return BaseResponseUtils.buildSuccess(res); } + /** + * 寮傚父鍏抽榾 + * @return 鏁版嵁闆嗗悎 + */ + @Operation(summary = "寮傚父鍏抽榾", description = "寮傚父鍏抽榾缁熻") + @ApiResponses(value = { + @ApiResponse( + responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE, + description = "寮傚父鍏抽榾缁熻锛圔aseResponse.content:QueryResultVo{[VoSteal{}]}锛�", + content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE, + schema = @Schema(implementation = VoAbnormalCloseValve.class))} + ) + }) + @GetMapping(path = "abnormalCloseValve") + @SsoAop() + public BaseResponse<QueryResultVo<List<VoAbnormalCloseValve>>> abnormalCloseValve(@Valid QoAbnormalCloseValve qo, BindingResult bindingResult) throws Exception { + if(bindingResult != null && bindingResult.hasErrors()){ + return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); + } + QueryResultVo<List<VoAbnormalCloseValve>> res = this.sv.abnormalCloseValve(qo); + return BaseResponseUtils.buildSuccess(res); + } + + + } -- Gitblit v1.8.0