From ada0b243f16f12b5025253663eacfe53055f8310 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 10 八月 2022 17:03:50 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
index c400470..bb04b27 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
@@ -24,7 +24,6 @@
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.mapper.PlayPlanNvMapper;
import lombok.AllArgsConstructor;
-import org.aspectj.weaver.ast.Var;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -201,7 +200,7 @@
programDto -> {
programDto.getWidgets().forEach(
widget -> {
- if (!PlayerWidgetType.WEATHER.equals(widget.getType())) {
+ if (PlayerWidgetType.PICTURE.equals(widget.getType()) || PlayerWidgetType.VIDEO.equals(widget.getType())) {
String url = widget.getUrl();
LEDProgramFile one = fileService.getOne(Wrappers.lambdaQuery(LEDProgramFile.class).eq(LEDProgramFile::getFileUrl, url));
if (one == null) {
@@ -228,7 +227,6 @@
}
);
program.setSchedule(playerSchedule);
-
program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
@@ -439,7 +437,7 @@
programDto -> {
programDto.getWidgets().forEach(
widget -> {
- if (!PlayerWidgetType.WEATHER.equals(widget.getType())) {
+ if (PlayerWidgetType.PICTURE.equals(widget.getType()) || PlayerWidgetType.VIDEO.equals(widget.getType())) {
String url = widget.getUrl();
LEDProgramFile one = fileService.getOne(Wrappers.lambdaQuery(LEDProgramFile.class).eq(LEDProgramFile::getFileUrl, url));
if (one == null) {
@@ -447,9 +445,6 @@
}
widget.setMd5(one.getMd5());
widget.setSize(Long.parseLong(one.getSize()));
- }else {
- //WratherPage
- System.out.println(widget+"widget");
}
}
);
--
Gitblit v1.9.3