IP音柱任务列表

zhanzhiqin

2022-04-18 98a9bf651c3e1e9a44a14bc6ad5143618bd9a0fb

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

@@ -333,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()) {
            eq.like(IpVolumeMission::getMissionName, keyword);
        }
        List<IpVolumeMission> list = list(eq);


        //  ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId();

        for (IpVolumeMission mission : list) {
            List<String> fileName = broadcastV2TaskFileService.findByTaskid(mission.getTaskId());
@@ -359,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) {
@@ -383,12 +373,12 @@
        }
        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("任务归属错误");
                }
            }
@@ -402,7 +392,6 @@
                .eq(BroadcastV2TaskFile::getTaskId, taskId));
        List<BroadcastV2TaskTerminal> taskTerminals = broadcastV2TaskTerminalService.list(Wrappers.lambdaQuery(BroadcastV2TaskTerminal.class)
                .eq(BroadcastV2TaskTerminal::getTaskId, taskId));



        if (!taskFiles.isEmpty()) {