功能完善

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);
@@ -318,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 {