From 0f1938fcb0acc34e2bf808048fa15435142cb5a6 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期日, 24 四月 2022 16:25:25 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 98 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 88 insertions(+), 10 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 17d41a4..b43db2a 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
@@ -5,6 +5,8 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.config.VnnoxConstant;
+import com.sandu.ximon.admin.dto.PlanDto;
+import com.sandu.ximon.admin.dto.SchedulesDTO;
import com.sandu.ximon.admin.param.PlayPlanParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
@@ -12,14 +14,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 +41,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());
@@ -52,7 +64,35 @@
playPlan.setStartDate(playPlanParam.getStartDate());
playPlan.setEndDate(playPlanParam.getEndDate());
playPlan.setWeekDays(playPlanParam.getWeekDays());
- playPlan.setSchedule(JSON.toJSONString(playPlanParam.getSchedule()));
+
+
+ Map schedule = playPlanParam.getSchedule();
+
+ String s = JSON.toJSONString(schedule.get("plans"));
+ List<PlanDto> plans = JSON.parseArray(s, PlanDto.class);
+ System.out.println(plans.toString()+"plans");
+
+// List<PlanDto> plans = (List<PlanDto>) schedule.get("plans");
+ plans.forEach(plan -> {
+ System.out.println(plan+"plan");
+ }
+ );
+
+ List<SchedulesDTO> schedulesDTOS = new ArrayList<>();
+ for (int i = 0; i < plans.size(); i++) {
+ SchedulesDTO schedulesDTO = new SchedulesDTO();
+ schedulesDTO.setStartDate(playPlanParam.getStartDate());
+ schedulesDTO.setEndDate(playPlanParam.getEndDate());
+ if (i % 2 == 1) {
+ schedulesDTO.setExecTime(plans.get(i).getStartTime());
+ } else {
+ schedulesDTO.setWeekDays(plans.get(i).getWeekDays());
+ schedulesDTO.setExecTime(plans.get(i).getEndTime());
+ }
+ schedulesDTOS.add(schedulesDTO);
+ }
+
+ playPlan.setSchedule(JSON.toJSONString(schedulesDTOS));
playPlan.setStartTime(playPlanParam.getStartTime());
playPlan.setEndTime(playPlanParam.getEndTime());
// BeanUtils.copyProperties(playPlanParam, playPlan);
@@ -109,11 +149,21 @@
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));
+//
+// test test = JSON.parseObject(pushToLed.getSchedule(), test.class);
+//
+// SchedulesDTO schedulesDTO = new SchedulesDTO();
+// schedulesDTO.setExecTime(A.get);
+
+
+ program.setSchedules((JSON.parseArray(pushToLed.getSchedule(), SchedulesDTO.class)));
+
+
+ // Map map = JSON.parseObject(pushToLed.getSchedule(), Map.class);
+
program.setNoticeUrl(VnnoxConstant.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);
@@ -123,7 +173,6 @@
success = vnnoxResultResponse.getData().getSuccess();
fail = vnnoxResultResponse.getData().getFail();
}
-
// fail.addAll(vnnoxResult.getFail());
Map<String, Object> result = new HashMap<>();
@@ -139,12 +188,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