From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 21 二月 2025 09:52:14 +0800
Subject: [PATCH] 针对王江海制定的协议： 1、优化相关注释； 2、优化代码； 3、协议中报警信息有变化：外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。
---
pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java
index ee36545..6f46207 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-irrigate/src/main/java/com/dy/pipIrrIrrigate/project/ProjectCtrl.java
@@ -8,6 +8,7 @@
import com.dy.pipIrrGlobal.pojoIr.IrProject;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voIr.VoProject;
+import com.dy.pipIrrGlobal.voIr.VoProjectOne;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrIrrigate.result.IrrigateResultCode;
@@ -221,13 +222,11 @@
})
@GetMapping(path = "one")
@SsoAop()
- public BaseResponse<IrProject> one(@RequestParam Long id) {
- IrProject irProject = this.projectSv.selectById(id);
- if (irProject == null) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.NO_PROJECT.getMessage());
- } else {
+ public BaseResponse<VoProjectOne> one(@RequestParam Long id) {
+ VoProjectOne irProject = this.projectSv.selectById(id);
+
return BaseResponseUtils.buildSuccess(irProject);
- }
+
}
/**
@@ -246,12 +245,9 @@
})
@GetMapping(path = "some")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoProject>>> getIntakes(QueryVo vo) {
+ public BaseResponse<QueryResultVo<List<VoProject>>> getProjects(QueryVo vo) {
try {
QueryResultVo<List<VoProject>> res = projectSv.getProjects(vo);
- if (res == null) {
- return BaseResponseUtils.buildFail(IrrigateResultCode.NO_PROJECT.getMessage());
- }
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鑾峰彇椤圭洰璁板綍寮傚父", e);
--
Gitblit v1.8.0