From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 132 ++++++++++++++++++++++++++++++-------------
1 files changed, 91 insertions(+), 41 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 2897450..6f3b801 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,23 +5,29 @@
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;
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.*;
-import com.sandu.ximon.dao.enums.AdministratorEnums;
+import com.sandu.ximon.dao.domain.LEDProgram;
+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 +46,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());
}
}
@@ -58,7 +64,46 @@
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");
+
+ List<SchedulesDTO> schedulesDTOS = new ArrayList<>();
+ for (int i = 0; i < plans.size(); i++) {
+ SchedulesDTO openDto = new SchedulesDTO();
+// if (i % 2 == 0) {
+// schedulesDTO.setExecTime(plans.get(i).getStartTime());
+// schedulesDTO.setStatus("OPEN");
+// } else {
+// schedulesDTO.setWeekDays(plans.get(i).getWeekDays());
+// schedulesDTO.setExecTime(plans.get(i).getEndTime());
+// schedulesDTO.setStatus("CLOSE");
+// }
+
+ SchedulesDTO closeDto = new SchedulesDTO();
+
+ openDto.setStartDate(schedule.get("startDate").toString());
+ openDto.setEndDate(schedule.get("endDate").toString());
+ openDto.setExecTime(plans.get(i).getStartTime());
+ openDto.setStatus("OPEN");
+
+ closeDto.setStartDate(schedule.get("startDate").toString());
+ closeDto.setEndDate(schedule.get("endDate").toString());
+ closeDto.setWeekDays(plans.get(i).getWeekDays());
+ closeDto.setExecTime(plans.get(i).getEndTime());
+ closeDto.setStatus("CLOSE");
+
+ schedulesDTOS.add(closeDto);
+ schedulesDTOS.add(openDto);
+ }
+
+ playPlan.setSchedule(JSON.toJSONString(schedulesDTOS));
playPlan.setStartTime(playPlanParam.getStartTime());
playPlan.setEndTime(playPlanParam.getEndTime());
// BeanUtils.copyProperties(playPlanParam, playPlan);
@@ -73,21 +118,11 @@
if (byId == null) {
throw new BusinessException("鎿嶄綔瀵硅薄涓嶅瓨鍦�");
}
- PlayPlanNv playPlan = new PlayPlanNv();
- playPlan.setId(id);
- playPlan.setName(playPlanParam.getName());
- playPlan.setLedProgramName(playPlanParam.getLedProgramName());
- playPlan.setLedProgramId(playPlanParam.getLedProgramId());
- playPlan.setVolume(playPlanParam.getVolume());
- playPlan.setApplySeries(playPlanParam.getApplySeries());
- playPlan.setStartDate(playPlanParam.getStartDate());
- playPlan.setEndDate(playPlanParam.getEndDate());
- playPlan.setWeekDays(playPlanParam.getWeekDays());
- playPlan.setSchedule(JSON.toJSONString(playPlanParam.getSchedule()));
- playPlan.setStartTime(playPlanParam.getStartTime());
- playPlan.setEndTime(playPlanParam.getEndTime());
+ if(removeById(id)){
+ return addPlan(playPlanParam);
+ }
- return updateById(playPlan);
+ return false;
}
@@ -101,24 +136,36 @@
return removeByIds(ids);
}
- public Map<String, Object> pushToLed(Long planId, List<String> playerIds) {
+ public Map<String, Object> pushToLed(Long planId, List<NovaPushResultVO> nova) {
// public PlayerProgram pushToLed(Long planId){
PushToLed pushToLed = playPlanMapper.pushToLed(planId);
PlayPlanNv one = getOne(Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getId, planId));
if (pushToLed == null) {
throw new BusinessException("鏈壘鍒拌鎾斁璁″垝");
}
- //List<String> playerIds=new ArrayList<>();
- // playerIds.add("872bb51ae0f06e70c21e913cf3dc9e4d");
- //List<Map<String,Object>> pages = JSON.parseObject(pushToLed.getPages(), List.class);
+ List<String> playerIds=new ArrayList<>();
+ nova.forEach(
+ n->{
+ playerIds.add(n.getPlayerId());
+ }
+ );
+
PlayerProgram program = new PlayerProgram();
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));
- Map map = 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.timeProgram(program);
@@ -132,22 +179,25 @@
fail = vnnoxResultResponse.getData().getFail();
}
-
// fail.addAll(vnnoxResult.getFail());
Map<String, Object> result = new HashMap<>();
- List<LedPlayerEntity> successList = new ArrayList<>();
- List<LedPlayerEntity> faileList = new ArrayList<>();
- for (String playerId : success) {
- successList.add(ledPlayerEntityService.getByPlayerId(playerId));
- }
- for (String playerId : fail) {
- faileList.add(ledPlayerEntityService.getByPlayerId(playerId));
- }
+ List<NovaPushResultVO> successList = new ArrayList<>();
+ List<NovaPushResultVO> faileList = new ArrayList<>();
+ List<String> finalSuccess = success;
+ List<String> finalFail = fail;
+ nova.forEach(
+ n->{
+ if(finalSuccess.contains(n.getPlayerId())){
+ successList.add(n);
+ }else if(finalFail.contains(n.getPlayerId())){
+ faileList.add(n);
+ }
+ }
+ );
result.put("success", successList);
result.put("fail", faileList);
- result.put("program", program);
return result;
// return program;
@@ -156,6 +206,7 @@
/**
* 瑙ｆ瀽瀹氭椂
+ *
* @param
* @return
*/
@@ -178,7 +229,6 @@
Open1.setEndDate(map.get("endDate").toString());
-
return null;
}
@@ -191,7 +241,7 @@
if (byId1 == null) {
throw new BusinessException("鎵句笉鍒拌鑺傜洰");
}
- Map schedule = JSON.parseObject(byId.getSchedule(), Map.class);
+ List schedule = JSON.parseObject(byId.getSchedule(), List.class);
List pages = JSON.parseObject(byId1.getPages(), List.class);
Map plan = new HashMap();
plan.put("planId", byId.getId());
--
Gitblit v1.9.3