Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-28 bfce748e37a753c729e15dd233600379f504d019

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

@@ -85,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();
@@ -224,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++;
@@ -242,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);
@@ -327,25 +333,22 @@


    public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword) {
        //  PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
        boolean r = clientService.findClientId();  //ture代表有上级客户  查询通过userID
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());

        List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
        LambdaQueryWrapper<IpVolumeMission> eq = new LambdaQueryWrapper<>();
        LambdaQueryWrapper<IpVolumeMission> eq = Wrappers.lambdaQuery(IpVolumeMission.class);

        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        if (r) {
            eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getUserId, SecurityUtils.getUserId());
        } else {
            eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getClientId, SecurityUtils.getUserId());
        //不是超管
        if (SecurityUtils.getClientId() != null) {
            eq = eq.eq(IpVolumeMission::getUserId, SecurityUtils.getUserId()).or(w -> {
                w.eq(IpVolumeMission::getClientId, SecurityUtils.getUserId());
            });
        }
        if (!keyword.isEmpty()) {
        if (keyword != null && !keyword.isEmpty()) {
            eq.like(IpVolumeMission::getMissionName, keyword);
        }
        List<IpVolumeMission> list = list(eq);


        //  ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId();

        for (IpVolumeMission mission : list) {
            List<String> fileName = broadcastV2TaskFileService.findByTaskid(mission.getTaskId());
@@ -353,16 +356,9 @@
            BeanUtils.copyProperties(mission, bo);
            bo.setFileNames(fileName);
            ipVolumeMissionBos.add(bo);

        }

//        for (IpVolumeMissionBo missionBo: ipVolumeMissionBos) {
//            missionBo.setFileNames(broadcastV2TaskFileService.findByTaskid(missionBo.getTaskId()));
//
//        }

        return ipVolumeMissionBos;
        //return new ArrayList<>();
    }

    public TaskVO getByTaskId(Integer taskId) {
@@ -377,25 +373,26 @@
        }
        if (SecurityUtils.getClientId() != null) {
            if (clientService.findClientId()) {
                if (byId.getUserId() != SecurityUtils.getUserId()) {
                if (byId.getUserId().equals(SecurityUtils.getUserId())) {
                    throw new BusinessException("任务归属错误");
                }

            } else {
                if (byId.getClientId() != SecurityUtils.getUserId()) {
                if (byId.getClientId().equals(SecurityUtils.getUserId())) {
                    throw new BusinessException("任务归属错误");
                }
            }


        }
        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(
@@ -423,9 +420,6 @@
            );
        }

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

        System.out.println(JSON.toJSONString(task));
        System.out.println(task);