From 031ab702d1a6c08c5339b9f5f4514c6879941a97 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 07 五月 2025 10:47:24 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
index 26e45fb..6bbaac0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/command/CommandSv.java
@@ -47,6 +47,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -258,6 +259,7 @@
* @param automaticClose
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public Map planedOpenTimedClose(AutomaticClose automaticClose, Long planId, Byte operatetype, Date startTime, Integer duration) {
Long intakeId = automaticClose.getIntakeId();
Long vcId = automaticClose.getVcId();
@@ -687,6 +689,7 @@
* @param operatetype
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public Map closeWx(ValveClose valve, Long planId, Byte operatetype) {
String rtuAddr = valve.getRtuAddr();
String vcNum = valve.getVcNum();
@@ -718,6 +721,7 @@
irIntakeOperate.setOperateType(operatetype);
irIntakeOperate.setCommandId(comId);
irIntakeOperate.setIntakeId(intakeId);
+ irIntakeOperate.setCommandResult((byte)1);
Long id = addIntakeOperate(irIntakeOperate);
if(id == null) {
--
Gitblit v1.8.0