Merge remote-tracking branch 'origin/master'

MercuryZ

2022-03-31 ef270bd1855b5ce3f398c5df024840a498e33a8f

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

@@ -25,7 +25,6 @@

import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;

@@ -39,6 +38,7 @@
public class IpVolumeMissionService extends BaseServiceImpl<IpVolumeMissionMapper, IpVolumeMission> {
    private final IpVolumeMissionMapper ipVolumeMissionMapper;
    private final ClientService clientService;
    private final IpVolumeService ipVolumeService;
    private final IpVolumeFileService ipVolumeFileService;
    private final BroadcastV2TaskFileService broadcastV2TaskFileService;
    private final BroadcastV2TaskTerminalService broadcastV2TaskTerminalService;
@@ -63,14 +63,14 @@

        if (missionparam.getTerminalIds().size() <= 0) {
            throw new BusinessException("播放终端不可为空");
           // return 3;
            // return 3;
        }

        //  封装播放终端
        List<TaskTerminalVO> taskTerminalVOList = new ArrayList<>();
        //  封装数据库中任务终端绑定
        List<BroadcastV2TaskTerminal> taskTerminalEntityList = new ArrayList<>();
        for(Integer id: new HashSet<>(missionparam.getTerminalIds())) {
        for (Integer id : new HashSet<>(missionparam.getTerminalIds())) {
            TaskTerminalVO taskTerminalVO = new TaskTerminalVO();
            BroadcastV2TaskTerminal taskTerminalEntity = new BroadcastV2TaskTerminal();

@@ -85,22 +85,25 @@
        List<TaskMediaFileVO> taskMediaFileVOS = new ArrayList<>();
        List<BroadcastV2TaskFile> taskFileEntityList = new ArrayList<>();
        int i = 1;
        for(Integer fileId: new HashSet<>(missionparam.getFileIds())) {
        for (Integer fileId : new HashSet<>(missionparam.getFileIds())) {
            TaskMediaFileVO taskMediaFileVO = new TaskMediaFileVO();
            BroadcastV2TaskFile taskFileEntity = new BroadcastV2TaskFile();

            taskFileEntity.setFileId(fileId);

            IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
            String absolutePath = MinIoConstant.getAbsolutePath(
                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
                    fileEntity.getFileName()
            );
            if (fileEntity == null) {
                throw new BusinessException("fileId为" + fileId + "的文件不存在");
            }
//            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);
@@ -113,17 +116,17 @@
        System.out.println("---------------------------");
        //  向IP音柱服务器添加任务
        Integer taskId = TaskAPIUtils.addTask(missionparam);
       // Integer taskId = 1111;
//        Integer taskId = 1111;

        if (null != taskId && taskId != 0) {
            IpVolumeMission byId = getById(taskId);
            for (BroadcastV2TaskTerminal v2TaskTerminal: taskTerminalEntityList) {
            for (BroadcastV2TaskTerminal v2TaskTerminal : taskTerminalEntityList) {
                v2TaskTerminal.setTaskId(taskId);
            }
            for (BroadcastV2TaskFile v2TaskFile :taskFileEntityList) {
            for (BroadcastV2TaskFile v2TaskFile : taskFileEntityList) {
                v2TaskFile.setTaskId(taskId);
            }
            if (byId==null) {
            if (byId == null) {
                //  向数据库添加该任务记录

                IpVolumeMission mission = new IpVolumeMission();
@@ -138,9 +141,8 @@
                mission.setOffDate(missionparam.getOffDate());
                mission.setWeek(Integer.parseInt(missionparam.getWeek(), 2));//时间由二进制字符串转换为十进制
                mission.setMissionVolume(missionparam.getMissionVolume());
                //mission.setMissionFileUrl(missionparam.getFiles().toString());
                mission.setNumberInPlay(missionparam.getTerminals().length);
                /*TaskTerminalVO[] terminals = missionparam.getTerminals();*/


                System.out.println(save(mission));
                System.out.println("----------------------------------------------------------");
@@ -157,17 +159,11 @@
                mission.setMissionVolume(missionparam.getMissionVolume());
                mission.setMissionFileUrl(missionparam.getFiles().toString());
                mission.setNumberInPlay(missionparam.getTerminals().length);
                System.out.println(updateById(mission));
                System.out.println("----------------------------------------------------------");
            }
            broadcastV2TaskFileService.deleteByTaskId(taskId);
            broadcastV2TaskTerminalService.deleteByTaskId(taskId);
//            broadcastV2TaskTerminalService.removeById(taskId);
            broadcastV2TaskTerminalService.saveTaskTerminal(taskTerminalEntityList);
            broadcastV2TaskFileService.saveBatch(taskFileEntityList);
//            broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList);
//            broadcastV2TaskTerminalService.insertTaskTerminal(taskTerminalEntityList);

            return true;
        } else {
            return false;
@@ -179,15 +175,15 @@

        String taskName = missionparam.getMissionName();

        if(null == taskName || "".equals(taskName)) {
        if (null == taskName || "".equals(taskName)) {
            return 4;
        }

        if(missionparam.getFileIds().size()<=0){
        if (missionparam.getFileIds().size() <= 0) {
            return 5;
        }

        if(missionparam.getTerminalIds().size()<=0){
        if (missionparam.getTerminalIds().size() <= 0) {
            return 6;
        }

@@ -196,7 +192,7 @@
        List<TaskTerminalVO> taskTerminalVOList = new ArrayList<>();
        //  封装数据库中任务终端绑定
        List<BroadcastV2TaskTerminal> taskTerminalEntityList = new ArrayList<>();
        for(Integer id: new HashSet<>(missionparam.getTerminalIds())) {
        for (Integer id : new HashSet<>(missionparam.getTerminalIds())) {
            TaskTerminalVO taskTerminalVO = new TaskTerminalVO();
            BroadcastV2TaskTerminal taskTerminalEntity = new BroadcastV2TaskTerminal();

@@ -211,7 +207,7 @@
        List<TaskMediaFileVO> taskMediaFileVOS = new ArrayList<>();
        List<BroadcastV2TaskFile> taskFileEntityList = new ArrayList<>();
        int i = 1;
        for(Integer fileId: new HashSet<>(missionparam.getFileIds())) {
        for (Integer fileId : new HashSet<>(missionparam.getFileIds())) {
            TaskMediaFileVO taskMediaFileVO = new TaskMediaFileVO();
            BroadcastV2TaskFile taskFileEntity = new BroadcastV2TaskFile();

@@ -241,12 +237,12 @@
        //  向IP音柱服务器更新任务
        Integer result = TaskAPIUtils.updateTask(taskId, missionparam);

        if(result==0){
        if (result == 0) {
            IpVolumeMission byId = getById(taskId);
            for (BroadcastV2TaskTerminal v2TaskTerminal: taskTerminalEntityList) {
            for (BroadcastV2TaskTerminal v2TaskTerminal : taskTerminalEntityList) {
                v2TaskTerminal.setTaskId(taskId);
            }
            for (BroadcastV2TaskFile v2TaskFile :taskFileEntityList) {
            for (BroadcastV2TaskFile v2TaskFile : taskFileEntityList) {
                v2TaskFile.setTaskId(taskId);
            }
            if (null == byId) {
@@ -264,7 +260,7 @@
                mission.setOffDate(missionparam.getOffDate());
                mission.setWeek(Integer.parseInt(missionparam.getWeek(), 2));//时间由二进制字符串转换为十进制
                mission.setMissionVolume(missionparam.getMissionVolume());
               // mission.setMissionFileUrl(missionparam.getFiles().toString());
                // mission.setMissionFileUrl(missionparam.getFiles().toString());
                mission.setNumberInPlay(missionparam.getTerminals().length);
                /*TaskTerminalVO[] terminals = missionparam.getTerminals();*/

@@ -279,7 +275,7 @@
                mission.setOffDate(missionparam.getOffDate());
                mission.setWeek(Integer.parseInt(missionparam.getWeek(), 2));//时间由二进制字符串转换为十进制
                mission.setMissionVolume(missionparam.getMissionVolume());
               // mission.setMissionFileUrl(missionparam.getFiles().toString());
                // mission.setMissionFileUrl(missionparam.getFiles().toString());
                mission.setNumberInPlay(missionparam.getTerminals().length);
                System.out.println(updateById(mission));
                System.out.println("----------------------------------------------------------");
@@ -290,69 +286,60 @@
            broadcastV2TaskFileService.saveBatch(taskFileEntityList);
            return 0;

        }else {
        } else {
            return result;
        }
    }

    /**
     * 删除任务
     *
     * @param taskId
     * @return0：成功   1：任务不处于空闲状态 2:服务器删除失败
     * @return0：成功 1：任务不处于空闲状态 2:服务器删除失败
     */
    public Integer deleteMission(Integer taskId) {
        Integer del = TaskAPIUtils.delTask(taskId);
        if(del==0){
        if (del == 0) {
            IpVolumeMission byId = getById(taskId);
            if (byId == null) {
               return -1;
                return -1;
            }
            removeById(taskId);
            broadcastV2TaskFileService.removeById(taskId);
            broadcastV2TaskTerminalService.removeById(taskId);
            broadcastV2TaskFileService.deleteByTaskId(taskId);
            broadcastV2TaskTerminalService.deleteByTaskId(taskId);
//            broadcastV2TaskTerminalService.removeById(taskId);
            return 0;
        }
        else {
        } else {
            return del;
        }

    }

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

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

//        if(r.equals(-1L)){
//            ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId(r);
//        }else {
//            ipVolumeMissionBos = ipVolumeMissionMapper.listAllByUserId(SecurityUtils.getUserId());
//        }
        if(r){
           eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getUserId, SecurityUtils.getUserId());
        }else {
           eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getClientId,SecurityUtils.getUserId());
        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(!keyword.isEmpty()){
            eq.like(IpVolumeMission::getMissionName,keyword);
        if (!keyword.isEmpty()) {
            eq.like(IpVolumeMission::getMissionName, keyword);
        }
        List<IpVolumeMission> list = list(eq);


        //  ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId();

        for (IpVolumeMission mission: list) {
        for (IpVolumeMission mission : list) {
            List<String> fileName = broadcastV2TaskFileService.findByTaskid(mission.getTaskId());
            IpVolumeMissionBo bo=new IpVolumeMissionBo();
            IpVolumeMissionBo bo = new IpVolumeMissionBo();
            BeanUtils.copyProperties(mission, bo);
            bo.setFileNames(fileName);
            ipVolumeMissionBos.add(bo);
@@ -368,20 +355,67 @@
        //return new ArrayList<>();
    }

    public IpVolumeMission getByTaskId(Integer taskId){
    public TaskVO getByTaskId(Integer taskId) {
        TaskVO task = TaskAPIUtils.getTask(taskId);
        if(task==null){
        if (task == null) {
            throw new BusinessException("服务器未找到该任务");
        }

        IpVolumeMission byId = getById(taskId);
        if(byId==null){
        if (byId == null) {
            throw new BusinessException("本地未找到该任务");
        }
        if (SecurityUtils.getClientId() != null) {
            if (clientService.findClientId()) {
                if (byId.getUserId() != SecurityUtils.getUserId()) {
                    throw new BusinessException("任务归属错误");
                }

        byId.setWeeks("0"+Integer.toBinaryString(byId.getWeek()));
            } else {
                if (byId.getClientId() != SecurityUtils.getUserId()) {
                    throw new BusinessException("任务归属错误");
                }
            }

        return byId;

        }
        task.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
//        byId.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
        task.setBdate(byId.getOnDate());
        task.setEdate(byId.getOffDate());

        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(
                    fileId -> {
//                           IpVolumeFile volumeFile = ipVolumeFileService.getById(fileId.getFileId());
//                           if(volumeFile==null){
//                               throw new BusinessException("任务文件不存在");
//                           }
                        task.getFileIds().add(fileId.getFileId());
//                           byId.getFileIds().add(fileId.getFileId());
                    }
            );

        }
        if (!taskTerminals.isEmpty()) {
            taskTerminals.forEach(
                    terminalId -> {
//                        BroadcastTerminalV2Entity v2Entity = ipVolumeService.getById(terminalId.getTerminalId());
//                        if(v2Entity==null){
//                            throw new BusinessException("该任务暂无设备使用");
//                        }
                        task.getTerminalIds().add(terminalId.getTerminalId());
//                        byId.getTerminalIds().add(terminalId.getTerminalId());
                    }
            );
        }

        return task;


    }