Merge remote-tracking branch 'origin/master'

Administrator

2023-08-09 cb5035579ae02a3aca05904ab419816f2fc509f2

 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);
    }

    /**