From 14ce780fb9977acad2b6dabf9033635b076f590b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期六, 07 五月 2022 14:49:12 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 820b157..94f8bbd 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
@@ -11,14 +11,13 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.utils.VnnoxProgramAPIUtil;
-import com.sandu.ximon.admin.utils.request.PlayerProgram;
+import com.sandu.ximon.admin.dto.nova.PlayerProgram;
import com.sandu.ximon.admin.utils.response.VnnoxResult;
import com.sandu.ximon.admin.utils.response.VnnoxResultResponse;
import com.sandu.ximon.admin.vo.NovaOpenVO;
import com.sandu.ximon.admin.vo.NovaPushResultVO;
import com.sandu.ximon.admin.vo.PlansVO;
import com.sandu.ximon.dao.domain.LEDProgram;
-import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.PlayPlanNv;
import com.sandu.ximon.dao.domain.PushToLed;
import com.sandu.ximon.dao.mapper.PlayPlanNvMapper;
@@ -104,7 +103,8 @@
schedulesDTOS.add(openDto);
}
- playPlan.setSchedule(JSON.toJSONString(schedulesDTOS));
+ playPlan.setSchedule(JSON.toJSONString(playPlanParam.getSchedule()));
+ playPlan.setSchedules(JSON.toJSONString(schedulesDTOS));
playPlan.setStartTime(playPlanParam.getStartTime());
playPlan.setEndTime(playPlanParam.getEndTime());
// BeanUtils.copyProperties(playPlanParam, playPlan);
@@ -155,24 +155,23 @@
program.setPlayerIds(playerIds);
System.out.println(pushToLed.getPages());
+ //鑾峰彇鑺傜洰瀹炰綋
program.setPages(JSON.parseObject(pushToLed.getPages(), List.class));
-//
-// test test = JSON.parseObject(pushToLed.getSchedule(), test.class);
-//
-// SchedulesDTO schedulesDTO = new SchedulesDTO();
-// schedulesDTO.setExecTime(A.get);
- program.setSchedules((JSON.parseArray(pushToLed.getSchedule(), SchedulesDTO.class)));
+ //鑾峰彇鑺傜洰瀹氭椂瀹炰綋
+ program.setSchedules((JSON.parseObject(pushToLed.getSchedules(), Map.class)));
+ //鑾峰彇瀹氭椂寮�鍏冲睆骞�
+// program.setSchedules((JSON.parseArray(pushToLed.getSchedule(), SchedulesDTO.class)));
// Map map = JSON.parseObject(pushToLed.getSchedule(), Map.class);
program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
- VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.timeProgram(program);
+// VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.timeProgram(program);
+ VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(program);
VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(playerIds, Integer.valueOf(one.getVolume()).intValue());
- // VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(push);
List<String> success = new ArrayList<>();
List<String> fail = new ArrayList<>();
if (vnnoxResultResponse.getData() != null) {
@@ -202,7 +201,6 @@
return result;
// return program;
-
}
/**
--
Gitblit v1.9.3