功能完善

liuhaonan

2022-03-08 a84c0acca7e350614ebd3a4855d754c6d6600946

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

@@ -92,15 +92,15 @@
            taskFileEntity.setFileId(fileId);

            IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
            String absolutePath = MinIoConstant.getAbsolutePath(
                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
                    fileEntity.getFileName()
            );
//            String absolutePath = MinIoConstant.getAbsolutePath(
//                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
//                    fileEntity.getFileName()
//            );

            taskMediaFileVO.setI(i);
            i++;
            taskMediaFileVO.setT(0);
            taskMediaFileVO.setN(absolutePath);
            taskMediaFileVO.setN(fileEntity.getFileUrl());
            taskMediaFileVO.setS(BigInteger.valueOf(fileEntity.getOriginSize()));

            taskMediaFileVOS.add(taskMediaFileVO);
@@ -112,9 +112,8 @@
        missionparam.setTerminals(taskTerminalVOList.toArray(new TaskTerminalVO[taskTerminalVOList.size()]));
        System.out.println("---------------------------");
        //  向IP音柱服务器添加任务
        //Integer taskId = TaskAPIUtils.addTask(missionparam);
       // System.out.println("---------------------------");
        Integer taskId = 1111;
        Integer taskId = TaskAPIUtils.addTask(missionparam);
//        Integer taskId = 1111;

        if (null != taskId && taskId != 0) {
            IpVolumeMission byId = getById(taskId);
@@ -158,16 +157,16 @@
                mission.setMissionVolume(missionparam.getMissionVolume());
                mission.setMissionFileUrl(missionparam.getFiles().toString());
                mission.setNumberInPlay(missionparam.getTerminals().length);
                System.out.println(updateById(mission));
                System.out.println("----------------------------------------------------------");
             /*   System.out.println(updateById(mission));
                System.out.println("----------------------------------------------------------");*/
            }
            broadcastV2TaskFileService.deleteByTaskId(taskId);
            broadcastV2TaskTerminalService.deleteByTaskId(taskId);
//            broadcastV2TaskTerminalService.removeById(taskId);
            broadcastV2TaskTerminalService.saveTaskTerminal(taskTerminalEntityList);
            broadcastV2TaskFileService.saveBatch(taskFileEntityList);
//            broadcastV2TaskTerminalService.insertTaskTerminal(taskTerminalEntityList);
//            broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList);
//            broadcastV2TaskTerminalService.insertTaskTerminal(taskTerminalEntityList);

            return true;
        } else {
@@ -319,25 +318,15 @@

    }

//    public List<IpVolumeMission> listMission(ReceiveParam receiveParam) {
//
//        LambdaQueryWrapper<IpVolumeMission> wrapper = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getClientId, SecurityUtils.getUserId()).like(IpVolumeMission::getMissionName, receiveParam.getKeyWord());
//
//        return list(wrapper);
//    }

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

        List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
        LambdaQueryWrapper<IpVolumeMission> eq=new LambdaQueryWrapper<>();

//        if(r.equals(-1L)){
//            ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId(r);
//        }else {
//            ipVolumeMissionBos = ipVolumeMissionMapper.listAllByUserId(SecurityUtils.getUserId());
//        }
        PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
        if(r){
           eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getUserId, SecurityUtils.getUserId());
        }else {