From 6cd57ba8bd4cc9680681a58eb542b38ba7419e85 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期日, 24 四月 2022 10:26:07 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 72 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 24 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 962bcdf..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
@@ -12,14 +12,20 @@
import com.sandu.ximon.admin.utils.request.PlayerProgram;
import com.sandu.ximon.admin.utils.response.VnnoxResult;
import com.sandu.ximon.admin.utils.response.VnnoxResultResponse;
-import com.sandu.ximon.dao.domain.*;
-import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.admin.vo.NovaOpenVO;
+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;
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;
/**
* 鎾斁璁″垝
@@ -33,12 +39,16 @@
private final LedPlayerEntityService ledPlayerEntityService;
private VnnoxAPIUtil vnnoxAPIUtil;
private final LEDProgramService ledProgramService;
+ private final ClientService clientService;
public boolean addPlan(PlayPlanParam playPlanParam) {
PlayPlanNv playPlan = new PlayPlanNv();
- if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ if (SecurityUtils.getClientId() != null) {
playPlan.setUserId(SecurityUtils.getUserId());
+ if (clientService.findClientId()) {
+ playPlan.setClientId(clientService.getClientId());
+ }
}
playPlan.setName(playPlanParam.getName());
playPlan.setLedProgramName(playPlanParam.getLedProgramName());
@@ -109,32 +119,17 @@
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.setSchedule(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);
- /* Map schedule = JSON.parseObject(pushToLed.getSchedule(), Map.class);
- Map<String,Object> push=new HashMap<>();
- push.put("playerIds",playerIds);
- push.put("pages",pages);
- push.put("schedule",schedule);
- push.put("noticeUrl", VnnoxConstant.SCREEN_SHOT_NOTIFY_URL);
-*/
- VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(program);
+ VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.timeProgram(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<>();
-// List<String> success=new ArrayList<>();
-// if(vnnoxResultResponse.getData().getSuccess()!=null&&vnnoxResultResponse.getData()!=null){
-// success = vnnoxResultResponse.getData().getSuccess();
-// }
-// //success.addAll(vnnoxResult.getSuccess());
-
-// if(vnnoxResultResponse.getData().getFail()!=null&vnnoxResultResponse.getData()!=null){
-// fail= vnnoxResultResponse.getData().getFail();
-// }
if (vnnoxResultResponse.getData() != null) {
success = vnnoxResultResponse.getData().getSuccess();
fail = vnnoxResultResponse.getData().getFail();
@@ -155,12 +150,41 @@
result.put("success", successList);
result.put("fail", faileList);
+ result.put("program", program);
return result;
// return program;
}
+ /**
+ * 瑙ｆ瀽瀹氭椂
+ *
+ * @param
+ * @return
+ */
+ public List<Map<String, Object>> parseSchedule(Map map) {
+ 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;
+ }
+
public Object getByPlanId(Long planId) {
PlayPlanNv byId = getById(planId);
if (byId == null) {
--
Gitblit v1.9.3