From 89b46667dc80617e806088a6cd7ceb77fe53a9a6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期六, 07 五月 2022 18:06:11 +0800
Subject: [PATCH] 固件升级
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 116 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 62 insertions(+), 54 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 b43db2a..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,13 +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;
@@ -73,26 +73,38 @@
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);
+ 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.setSchedule(JSON.toJSONString(playPlanParam.getSchedule()));
+ playPlan.setSchedules(JSON.toJSONString(schedulesDTOS));
playPlan.setStartTime(playPlanParam.getStartTime());
playPlan.setEndTime(playPlanParam.getEndTime());
// BeanUtils.copyProperties(playPlanParam, playPlan);
@@ -107,21 +119,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;
}
@@ -135,38 +137,41 @@
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());
+ //鑾峰彇鑺傜洰瀹炰綋
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) {
@@ -176,23 +181,26 @@
// 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;
-
}
/**
@@ -232,7 +240,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