From cb5035579ae02a3aca05904ab419816f2fc509f2 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 09 八月 2023 14:33:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java
index ac64509..c10c735 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/tube/service/impl/ArdAlarmTubeServiceImpl.java
@@ -4,7 +4,9 @@
import com.ruoyi.alarm.tube.mapper.ArdAlarmTubeMapper;
import com.ruoyi.alarm.tube.service.IArdAlarmTubeService;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.List;
@@ -50,8 +52,9 @@
*/
@Override
public int insertArdAlarmTube(ArdAlarmTube ardAlarmTube) {
- ardAlarmTube.setCreateTime(DateUtils.getNowDate());
- return ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
+ ardAlarmTube.setTubeId(IdUtils.simpleUUID());
+ ardAlarmTube.setCreateTime(DateUtils.getNowDate());
+ return ardAlarmTubeMapper.insertArdAlarmTube(ardAlarmTube);
}
/**
--
Gitblit v1.9.3