From ac0aa84320c8988bd1bf222a5cb3d3ea484669de Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 11 七月 2024 20:14:58 +0800
Subject: [PATCH] 修改片区备注、区域着色 字段长度限制可以为0
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
index 7cc13da..7a7f9c4 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/ValveCtrl.java
@@ -72,6 +72,7 @@
Long intakeId = valve.getIntakeId();
String intakeName = valve.getIntakeName();
Long vcId = valve.getVcId();
+ Boolean forceOpen = valve.getForceOpen();
Long operator = valve.getOperator();
Long comId = idLongGenerator.generate();
@@ -109,7 +110,9 @@
if (vc == null) {
return BaseResponseUtils.buildErrorMsg(WechatResultCode.PLEASE_SELECT_A_VC.getMessage());
}
- if (vc.getInUse() == 1) {
+
+ // 铏氭嫙鍗＄姸鎬佷负浣跨敤涓紝涓斾笉鏄己鍒跺紑闃�鏃舵彁绀�
+ if (vc.getInUse() == 1 && !forceOpen) {
return BaseResponseUtils.buildErrorMsg(WechatResultCode.IN_USE_VC_CANNOT_OPEN_VALVE.getMessage());
}
--
Gitblit v1.8.0