From fa3ece9c09af10534a5d08e49d6c6ce0dde1c4f9 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 15 二月 2022 16:49:34 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 70 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 19 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 8f1ed6c..67c351e 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,10 +1,17 @@
package com.sandu.ximon.admin.service;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.param.PlayPlanParam;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.VnnoxProgramAPIUtil;
+import com.sandu.ximon.admin.utils.request.PlayerProgram;
+import com.sandu.ximon.admin.utils.response.VnnoxResultResponse;
+import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal;
+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.enums.AdministratorEnums;
@@ -13,10 +20,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 鎾斁璁″垝
@@ -26,6 +30,8 @@
public class PlayPlanNvService extends BaseServiceImpl<PlayPlanNvMapper, PlayPlanNv> {
private final PlayPlanNvMapper playPlanMapper;
+ private final VnnoxProgramAPIUtil vnnoxProgramAPIUtil;
+ private final LedPlayerEntityService ledPlayerEntityService;
public boolean addPlan(PlayPlanParam playPlanParam) {
@@ -73,33 +79,59 @@
}
- public boolean deletePlan(Long id) {
- PlayPlanNv byId = getById(id);
- if (byId == null) {
- throw new BusinessException("鎿嶄綔瀵硅薄涓嶅瓨鍦�");
+ public boolean deletePlan(List<Long> ids) {
+ for(Long id:ids){
+ PlayPlanNv byId = getById(id);
+ if (byId == null) {
+ throw new BusinessException("閮ㄥ垎鎿嶄綔瀵硅薄涓嶅瓨鍦�");
+ }
}
-
- return removeById(id);
-
+ return removeByIds(ids);
}
- public Map<String, Object> pushToLed(Long planId){
+ public Map<String, Object> pushToLed(Long planId,List<String> playerIds){
+// public PlayerProgram pushToLed(Long planId){
PushToLed pushToLed = playPlanMapper.pushToLed(planId);
if(pushToLed==null){
throw new BusinessException("鏈壘鍒拌鎾斁璁″垝");
}
- List<String> playerIds=new ArrayList<>();
- playerIds.add("led鐨勭紪鍙�");
- List<Map<String,Object>> pages = JSON.parseObject(pushToLed.getPages(), List.class);
- Map schedule = JSON.parseObject(pushToLed.getSchedule(), Map.class);
- Map<String,Object> push=new HashMap<>();
+ //List<String> playerIds=new ArrayList<>();
+ // playerIds.add("872bb51ae0f06e70c21e913cf3dc9e4d");
+ //List<Map<String,Object>> pages = JSON.parseObject(pushToLed.getPages(), List.class);
+ 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.setSchedule(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","杩欓噷鏄洖璋冨湴鍧�");
+ push.put("noticeUrl", VnnoxConstant.SCREEN_SHOT_NOTIFY_URL);
+*/
+ VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(program);
+ // VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(push);
+ List<String> success = vnnoxResultResponse.getData().getSuccess();
+ List<String> fail = vnnoxResultResponse.getData().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));
+ }
- return push;
+ result.put("success",successList);
+ result.put("fail",faileList);
+
+ return result;
+ // return program;
}
}
--
Gitblit v1.9.3