From b33cc5833ea02e3c330ef4d98ba3b5b02126cf73 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期日, 24 四月 2022 09:55:05 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 44 ++++++++++++++++++++++++++++----------------
1 files changed, 28 insertions(+), 16 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 3f7e0fe..66f6fc6 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
@@ -14,14 +14,18 @@
import com.sandu.ximon.admin.utils.response.VnnoxResultResponse;
import com.sandu.ximon.admin.vo.NovaOpenVO;
import com.sandu.ximon.admin.vo.PlansVO;
-import com.sandu.ximon.dao.domain.*;
-import com.sandu.ximon.dao.enums.AdministratorEnums;
+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;
import lombok.AllArgsConstructor;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 鎾斁璁″垝
@@ -40,9 +44,9 @@
public boolean addPlan(PlayPlanParam playPlanParam) {
PlayPlanNv playPlan = new PlayPlanNv();
- if (SecurityUtils.getClientId()!=null){
+ if (SecurityUtils.getClientId() != null) {
playPlan.setUserId(SecurityUtils.getUserId());
- if(clientService.findClientId()){
+ if (clientService.findClientId()) {
playPlan.setClientId(clientService.getClientId());
}
}
@@ -115,9 +119,8 @@
program.setPlayerIds(playerIds);
System.out.println(pushToLed.getPages());
- System.out.println(JSON.parseArray(pushToLed.getPages(), Map.class));
program.setPages(JSON.parseObject(pushToLed.getPages(), List.class));
- program.setSchedules(JSON.parseObject(pushToLed.getSchedule(), Map.class));
+ program.setSchedules(JSON.parseObject(pushToLed.getSchedule(), List.class));
Map map = JSON.parseObject(pushToLed.getSchedule(), Map.class);
program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
@@ -156,18 +159,27 @@
/**
* 瑙ｆ瀽瀹氭椂
+ *
* @param
* @return
*/
public List<Map<String, Object>> parseSchedule(Map map) {
-// map.get("startDate");
-// map.get("endDate");
-// List plans = (List<PlansVO>) map.get("plans");
-//
-// NovaOpenVO Open1 = new NovaOpenVO();
-// Open1.setStartDate(map.get("startDate").toString());
-// Open1.setEndDate(map.get("endDate").toString());
-// Open1.setExecTime();
+ map.get("startDate");
+ map.get("endDate");
+ List<PlansVO> plans = (List<PlansVO>) map.get("plans");
+
+
+ plans.forEach(
+ plan -> {
+ NovaOpenVO Open = new NovaOpenVO();
+ Open.setStartDate(map.get("startDate").toString());
+ Open.setEndDate(map.get("endDate").toString());
+ Open.setExecTime(plan.getStartTime());
+ }
+ );
+ NovaOpenVO Open1 = new NovaOpenVO();
+ Open1.setStartDate(map.get("startDate").toString());
+ Open1.setEndDate(map.get("endDate").toString());
return null;
--
Gitblit v1.9.3