From c5d7b0a8968e54a3a9c7714ff949026f989de620 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 02 四月 2025 15:14:11 +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 | 6 ++++--
1 files changed, 4 insertions(+), 2 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 38b60b2..714a413 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
@@ -250,7 +250,7 @@
* @param automaticClose
* @return
*/
- public Map planedOpenTimedClose(AutomaticClose automaticClose, Date startTime, Integer duration) {
+ public Map planedOpenTimedClose(AutomaticClose automaticClose, Long planId, Date startTime, Integer duration) {
Long intakeId = automaticClose.getIntakeId();
Long vcId = automaticClose.getVcId();
Date plannedOpenTime = automaticClose.getPlannedOpenTime();
@@ -259,8 +259,10 @@
Byte openType = automaticClose.getOpenType();
Long comId = new IDLongGenerator().generate();
- if(openType == 1) {
+ if(openType != null && openType == 1) {
IrIntakeOperate irIntakeOperate = new IrIntakeOperate();
+ irIntakeOperate.setPlanId(planId);
+ irIntakeOperate.setOperateType((byte)1);
irIntakeOperate.setCommandId(comId);
irIntakeOperate.setIntakeId(intakeId);
irIntakeOperate.setStartTime(startTime);
--
Gitblit v1.8.0