From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java |   24 +++++-------------------
 1 files changed, 5 insertions(+), 19 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 681d20d..7838f84 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
@@ -175,22 +175,21 @@
         return updateResult;
     }
 
-    public boolean deleteProgram(Long pid) {
-        PoleXixunPlayerEntity byId = getById(pid);
-        if (byId == null) {
+    public boolean deleteProgram(List<Long> pids) {
+        List<PoleXixunPlayerEntity> poleXixunPlayerEntities = listByIds(pids);
+        if (poleXixunPlayerEntities.isEmpty()) {
             throw new BusinessException("鏈壘鍒拌鑺傜洰");
         }
         /**
          * 鐔欐睕鑺傜洰鍒犻櫎鏃ュ織璁板綍寮�濮�
          */
-        String content = "{鍒犻櫎鐨勮妭鐩甶d锛�" + byId.getProgramId()
-                + "锛� 鍒犻櫎鐨勮妭鐩悕绉帮細" + byId.getProgramName()
+        String content = "{鍒犻櫎鐨勮妭鐩甶d锛�" + pids
                 + " }";
         StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕鑺傜洰鍒犻櫎", content);
         /**
          * 鐔欐睕鑺傜洰鍒犻櫎鏃ュ織璁板綍缁撴潫
          */
-        return removeById(pid);
+        return removeByIds(pids);
     }
 
     public Object getByPid(Long pid) {
@@ -408,19 +407,6 @@
                     lightemitUtils.clearPlayerTask(lightemitControlCode);
                     //鎺ㄩ�佹渶鍚庡懡浠�
                     lightemitUtils.sendLastCommand(lightemitControlCode);
-
-                    /**
-                     * 鐔欐睕澶ф皵鏁版嵁鎺ㄩ�佹棩蹇楄褰曞紑濮�
-                     //                     */
-//                    String content = "{璁惧code锛�" + lightemitControlCode
-//                            + "锛� 鎺ㄩ�佸唴瀹癸細" + body
-//                            + " }";
-//                    List<String> listCode = new ArrayList<>();
-//                    listCode.add(lightemitControlCode);
-//                    StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕澶ф皵鏁版嵁鎺ㄩ��", content);
-                    /**
-                     * 鐔欐睕澶ф皵鏁版嵁鎺ㄩ�佹棩蹇楄褰曠粨鏉�
-                     */
                 }
             }, 60 * 1000);
         }

--
Gitblit v1.9.3