From bd48ab67b09fdd8a18df9787f1c0f0782fc95539 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 14 二月 2022 14:16:23 +0800
Subject: [PATCH] 功能完善

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 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 9e3074f..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,6 +1,7 @@
 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;
@@ -9,6 +10,8 @@
 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;
@@ -17,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.*;
 
 /**
  * 鎾斁璁″垝
@@ -31,6 +31,7 @@
 
     private final PlayPlanNvMapper playPlanMapper;
     private final VnnoxProgramAPIUtil vnnoxProgramAPIUtil;
+    private final LedPlayerEntityService ledPlayerEntityService;
 
     public boolean addPlan(PlayPlanParam playPlanParam) {
 
@@ -117,8 +118,17 @@
         List<String> success = vnnoxResultResponse.getData().getSuccess();
         List<String> fail = vnnoxResultResponse.getData().getFail();
         Map<String,Object> result=new HashMap<>();
-        result.put("success",success);
-        result.put("fail",fail);
+        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));
+        }
+
+        result.put("success",successList);
+        result.put("fail",faileList);
 
         return result;
        // return program;

--
Gitblit v1.9.3