fix

zhanzhiqin

2022-04-15 f92e7a801cb5e59bd2391641eccad67036513b8a

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java

@@ -7,6 +7,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
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;
@@ -84,7 +85,7 @@
        //  封装播放文件列表
        List<TaskMediaFileVO> taskMediaFileVOS = new ArrayList<>();
        List<BroadcastV2TaskFile> taskFileEntityList = new ArrayList<>();
        int i = 6666;
        int i = 1;
        for (Integer fileId : new HashSet<>(missionparam.getFileIds())) {
            TaskMediaFileVO taskMediaFileVO = new TaskMediaFileVO();
            BroadcastV2TaskFile taskFileEntity = new BroadcastV2TaskFile();
@@ -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,15 +224,22 @@
            taskFileEntity.setFileId(fileId);

            IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
//            String absolutePath = MinIoConstant.getAbsolutePath(
//                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
//                    fileEntity.getFileName()
//            );
            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);
@@ -232,7 +249,6 @@

        missionparam.setFiles(taskMediaFileVOS.toArray(new TaskMediaFileVO[taskMediaFileVOS.size()]));
        missionparam.setTerminals(taskTerminalVOList.toArray(new TaskTerminalVO[taskTerminalVOList.size()]));
        System.out.println("---------------------------");

        //  向IP音柱服务器更新任务
        Integer result = TaskAPIUtils.updateTask(taskId, missionparam);
@@ -379,13 +395,15 @@


        }
        task.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
        task.setWeeks("0" + Integer.toBinaryString(task.getWeek()));
//        byId.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));

        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()) {
            taskFiles.forEach(
@@ -413,9 +431,6 @@
            );
        }

//        Map map=new HashMap();
//        map.put("本地",byId);
//        map.put("服务器",task);

        System.out.println(JSON.toJSONString(task));
        System.out.println(task);
@@ -424,12 +439,44 @@

    }

    /**
     * 推送
     *
     * @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);
    }
}