From a1c416b13a71c293c3430f2c9cbce97ee96085ba Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 26 五月 2022 17:06:12 +0800
Subject: [PATCH] 节目推送结果

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
index af2a95c..7b30ecd 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
@@ -77,7 +77,7 @@
                                 LedSFile file = xiXunFileService.getById(fileId);
                                 String fileUrl = file.getFileUrl();
                                 String[] split = fileUrl.split("/");
-                                sourcePro.setId(split[split.length-1]);
+                                sourcePro.setId(split[split.length - 1]);
                                 sourcePro.setMd5(file.getMd5());
                             }
                     );
@@ -168,7 +168,9 @@
      * @param programId
      * @param lightemitIds
      */
-    public void videoXixunPlayer(long programId, List<Long> lightemitIds) {
+    public List<Map> videoXixunPlayer(long programId, List<Long> lightemitIds) {
+        //璁板綍鎿嶄綔缁撴灉
+        List<Map> mapList = new ArrayList<>();
 
         ProgramPro pro = new ProgramPro();
         ItemPro items = new ItemPro();
@@ -215,11 +217,29 @@
         Collection<PoleLightemitEntity> poleLightemitEntities = poleLightemitService.listByIds(lightemitIds);
 
         if (poleLightemitEntities != null) {
+            Map map;
             for (PoleLightemitEntity entity : poleLightemitEntities) {
-                lightemitUtils.clear(entity.getLightemitControlCode());
-                poleLightemitService.updateRequestBody(entity.getLightemitControlCode(), jsondata);
-                String post = lightemitUtils.post(realtimeServerBean.getCommand() + entity.getLightemitControlCode(), jsondata);
-                LogUtils.error("缁撴灉:" + post);
+                map = new LinkedHashMap();
+                String clearResult = lightemitUtils.clear(entity.getLightemitControlCode());
+                if (clearResult.contains("does not exist")) {
+                    map.put("LightemitId", entity.getLightemitId());
+                    map.put("Result", "澶辫触");
+                    mapList.add(map);
+                } else {
+                    poleLightemitService.updateRequestBody(entity.getLightemitControlCode(), jsondata);
+                    String post = lightemitUtils.post(realtimeServerBean.getCommand() + entity.getLightemitControlCode(), jsondata);
+                    //{"_type":"success","_id":"ce8dc3ff-dc88-43b7-8f55-60abd8700f1a","timestamp":1653555160535}
+                    if (post.startsWith("{") && post.endsWith("}") && post.contains("_type\":\"success")) {
+                        map.put("LightemitId", entity.getLightemitId());
+                        map.put("Result", "鎴愬姛");
+                        mapList.add(map);
+                    } else {
+                        map.put("LightemitId", entity.getLightemitId());
+                        map.put("Result", "澶辫触");
+                        mapList.add(map);
+                    }
+                    LogUtils.error("缁撴灉:" + post);
+                }
             }
         }
 
@@ -239,6 +259,8 @@
         /**
          * 鐔欐睕鑺傜洰鎺ㄩ�佹棩蹇楄褰曠粨鏉�
          */
+
+        return mapList;
     }
 
 

--
Gitblit v1.9.3