From 52eb3f0befcb397d2fdd645c8d7471d6ee477f87 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 09 五月 2022 16:36:38 +0800
Subject: [PATCH] 权限
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 135 ++++++++++++++++++++++++++++++++++----------
1 files changed, 104 insertions(+), 31 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 820b157..e23b57f 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
@@ -1,5 +1,7 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
@@ -7,18 +9,18 @@
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.dto.nova.PlayerProgram;
+import com.sandu.ximon.admin.dto.nova.ProgramSchedule;
+import com.sandu.ximon.admin.entity.Plans;
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.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;
@@ -71,21 +73,15 @@
String s = JSON.toJSONString(schedule.get("plans"));
List<PlanDto> plans = JSON.parseArray(s, PlanDto.class);
- System.out.println(plans.toString()+"plans");
+ 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();
@@ -93,6 +89,19 @@
openDto.setEndDate(schedule.get("endDate").toString());
openDto.setExecTime(plans.get(i).getStartTime());
openDto.setStatus("OPEN");
+
+ /**
+ * 鍒ゆ柇鏃堕棿鐨勫厛鍚�
+ */
+ String startTime = openDto.getStartDate()+" " +plans.get(i).getStartTime();
+ String endTime =openDto.getEndDate()+ " " +plans.get(i).getEndTime();
+
+ //杞崲鎴愭椂闂存埑
+ long startTimeStamp = DateUtil.parse(startTime, DatePattern.NORM_DATETIME_PATTERN).getTime();
+ long endTimeStamp = DateUtil.parse(endTime, DatePattern.NORM_DATETIME_PATTERN).getTime();
+ if(startTimeStamp>endTimeStamp){
+ throw new BusinessException("寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�");
+ }
closeDto.setStartDate(schedule.get("startDate").toString());
closeDto.setEndDate(schedule.get("endDate").toString());
@@ -104,7 +113,8 @@
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);
@@ -119,7 +129,7 @@
if (byId == null) {
throw new BusinessException("鎿嶄綔瀵硅薄涓嶅瓨鍦�");
}
- if(removeById(id)){
+ if (removeById(id)) {
return addPlan(playPlanParam);
}
@@ -144,35 +154,46 @@
if (pushToLed == null) {
throw new BusinessException("鏈壘鍒拌鎾斁璁″垝");
}
- List<String> playerIds=new ArrayList<>();
+ List<String> playerIds = new ArrayList<>();
nova.forEach(
- n->{
+ 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.setSchedule((JSON.parseObject(pushToLed.getSchedule(), Map.class)));
+ Map map = JSON.parseObject(pushToLed.getSchedule(), Map.class);
+ map.get("plans");
+ List<Plans> plans = JSON.parseArray(map.get("plans").toString(), Plans.class);
+ plans.forEach(
+ p -> {
+ //鍒犻櫎鍚庝袱浣嶅瓧绗︿覆
+ p.setStartTime(p.getStartTime().substring(0, p.getStartTime().length() - 3));
+ p.setEndTime(p.getEndTime().substring(0, p.getEndTime().length() - 3));
+ }
+ );
+ System.out.println(plans + "plans11111");
+ map.put("plans", plans);
+ program.setSchedule(map);
+ //鑾峰彇瀹氭椂寮�鍏冲睆骞�
+// 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);
- VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(playerIds, Integer.valueOf(one.getVolume()).intValue());
+// VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.timeProgram(program);
+ VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(program);
+ 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) {
@@ -180,17 +201,17 @@
fail = vnnoxResultResponse.getData().getFail();
}
- // fail.addAll(vnnoxResult.getFail());
+ //鎷兼帴鎴愬姛澶辫触鐨勭粨鏋�
Map<String, Object> result = new HashMap<>();
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())){
+ n -> {
+ if (finalSuccess.contains(n.getPlayerId())) {
successList.add(n);
- }else if(finalFail.contains(n.getPlayerId())){
+ } else if (finalFail.contains(n.getPlayerId())) {
faileList.add(n);
}
}
@@ -202,7 +223,51 @@
return result;
// return program;
+ }
+
+ //鎺ㄩ�佸畾鏃跺埌LED
+ public Map<String, Object> pushSchedule(Long planId, List<NovaPushResultVO> nova) {
+ PlayPlanNv one = getOne(Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getId, planId));
+ List<SchedulesDTO> schedulesDTOS = JSON.parseArray(one.getSchedules(), SchedulesDTO.class);
+ ProgramSchedule programSchedule = new ProgramSchedule();
+ programSchedule.setSchedules(schedulesDTOS);
+ List<String> playerIds = new ArrayList<>();
+ nova.forEach(
+ n -> {
+ playerIds.add(n.getPlayerId());
+ }
+ );
+ //璁剧疆
+ programSchedule.setPlayerIds(playerIds);
+ VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.timeProgram(programSchedule);
+ List<String> success = new ArrayList<>();
+ List<String> fail = new ArrayList<>();
+ if (vnnoxResultResponse.getData() != null) {
+ success = vnnoxResultResponse.getData().getSuccess();
+ fail = vnnoxResultResponse.getData().getFail();
+ }
+
+ //鎷兼帴鎴愬姛澶辫触鐨勭粨鏋�
+ Map<String, Object> result = new HashMap<>();
+ 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);
+ return result;
}
/**
@@ -233,6 +298,12 @@
return null;
}
+ /**
+ * 鑾峰彇鎾斁璁″垝
+ *
+ * @param planId
+ * @return
+ */
public Object getByPlanId(Long planId) {
PlayPlanNv byId = getById(planId);
if (byId == null) {
@@ -242,7 +313,8 @@
if (byId1 == null) {
throw new BusinessException("鎵句笉鍒拌鑺傜洰");
}
- List schedule = JSON.parseObject(byId.getSchedule(), List.class);
+ List schedule = JSON.parseObject(byId.getSchedules(), List.class);
+ Map schedules = JSON.parseObject(byId.getSchedule(), Map.class);
List pages = JSON.parseObject(byId1.getPages(), List.class);
Map plan = new HashMap();
plan.put("planId", byId.getId());
@@ -253,6 +325,7 @@
plan.put("preview", byId1.getPreview());
plan.put("pages", pages);
plan.put("schedule", schedule);
+ plan.put("schedules", schedules);
return plan;
}
}
--
Gitblit v1.9.3