From 3ce864cbadc8a9cd6340fc4db9e605b496f6ac81 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 14 四月 2022 10:57:42 +0800
Subject: [PATCH] 设备汇总

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java |   80 +++++++++++++++++++++++++++++++++-------
 1 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
index b98e853..c5eb375 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
@@ -1,12 +1,13 @@
 package com.sandu.ximon.admin.service;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
 import com.sandu.common.execption.BusinessException;
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.config.MinIoConstant;
+import com.sandu.ximon.admin.minio.entity.MinIoConstant;
 import com.sandu.ximon.admin.param.IpVolumeMissionParam;
 import com.sandu.ximon.admin.security.SecurityUtils;
 import com.sandu.ximon.admin.utils.TaskAPIUtils;
@@ -95,15 +96,24 @@
             if (fileEntity == null) {
                 throw new BusinessException("fileId涓�" + fileId + "鐨勬枃浠朵笉瀛樺湪");
             }
-//            String absolutePath = MinIoConstant.getAbsolutePath(
-//                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
-//                    fileEntity.getFileName()
-//            );
-
+            if (fileEntity.getUserId() == null && fileEntity.getClientId() != null) {
+                fileEntity.setUserId(fileEntity.getClientId());
+            }
+            String absolutePath;
+            absolutePath = MinIoConstant.getAbsolutePath(
+                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
+                    fileEntity.getFileName()
+            );
+            if (fileEntity.getUserId() == null && fileEntity.getClientId() == null) {
+                absolutePath = MinIoConstant.getAbsolutePath(
+                        MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
+                        fileEntity.getFileName()
+                );
+            }
             taskMediaFileVO.setI(i);
             i++;
             taskMediaFileVO.setT(0);
-            taskMediaFileVO.setN(fileEntity.getFileUrl());
+            taskMediaFileVO.setN(absolutePath);
             taskMediaFileVO.setS(BigInteger.valueOf(fileEntity.getOriginSize()));
 
             taskMediaFileVOS.add(taskMediaFileVO);
@@ -214,10 +224,17 @@
             taskFileEntity.setFileId(fileId);
 
             IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
-            String absolutePath = MinIoConstant.getAbsolutePath(
+            String absolutePath;
+            absolutePath = MinIoConstant.getAbsolutePath(
                     MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
                     fileEntity.getFileName()
             );
+            if (fileEntity.getUserId() == null && fileEntity.getClientId() == null) {
+                absolutePath = MinIoConstant.getAbsolutePath(
+                        MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
+                        fileEntity.getFileName()
+                );
+            }
 
             taskMediaFileVO.setI(i);
             i++;
@@ -232,7 +249,6 @@
 
         missionparam.setFiles(taskMediaFileVOS.toArray(new TaskMediaFileVO[taskMediaFileVOS.size()]));
         missionparam.setTerminals(taskTerminalVOList.toArray(new TaskTerminalVO[taskTerminalVOList.size()]));
-        System.out.println("---------------------------");
 
         //  鍚慖P闊虫煴鏈嶅姟鍣ㄦ洿鏂颁换鍔�
         Integer result = TaskAPIUtils.updateTask(taskId, missionparam);
@@ -379,18 +395,16 @@
 
 
         }
-        task.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
+        task.setWeeks("0" + Integer.toBinaryString(task.getWeek()));
 //        byId.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
 
-//        IpVolumeMissionBo bo = new IpVolumeMissionBo();
         List<BroadcastV2TaskFile> taskFiles = broadcastV2TaskFileService.list(Wrappers.lambdaQuery(BroadcastV2TaskFile.class)
                 .eq(BroadcastV2TaskFile::getTaskId, taskId));
         List<BroadcastV2TaskTerminal> taskTerminals = broadcastV2TaskTerminalService.list(Wrappers.lambdaQuery(BroadcastV2TaskTerminal.class)
                 .eq(BroadcastV2TaskTerminal::getTaskId, taskId));
 
-//        if(taskFiles.isEmpty()||taskTerminals.isEmpty()){
-//            throw new BusinessException("");
-//        }
+
+
         if (!taskFiles.isEmpty()) {
             taskFiles.forEach(
                     fileId -> {
@@ -417,14 +431,52 @@
             );
         }
 
+
+        System.out.println(JSON.toJSONString(task));
+        System.out.println(task);
         return task;
 
 
     }
 
+    /**
+     * 鎺ㄩ��
+     *
+     * @param taskId
+     * @return
+     */
     public boolean playTask(Integer taskId) {
         return TaskAPIUtils.playTask(taskId);
     }
 
 
+    /**
+     * 鍋滄
+     *
+     * @param taskId
+     * @return
+     */
+    public boolean stopTask(Integer taskId) {
+        return TaskAPIUtils.stopTask(taskId);
+    }
+
+    /**
+     * 鏆傚仠
+     *
+     * @param taskId
+     * @return
+     */
+    public boolean pauseTask(Integer taskId) {
+        return TaskAPIUtils.pauseTask(taskId);
+    }
+
+    /**
+     * 缁х画
+     *
+     * @param taskId
+     * @return
+     */
+    public boolean continueTask(Integer taskId) {
+        return TaskAPIUtils.continueTask(taskId);
+    }
 }

--
Gitblit v1.9.3