Merge remote-tracking branch 'origin/master'

liuhaonan

2022-03-09 fc34005a2bb11d57a9d7eba2ae9f1b7492d570d1

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

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

            IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
            if(fileEntity==null){
                throw new BusinessException("fileId为"+fileId+"的文件不存在");
            }
//            String absolutePath = MinIoConstant.getAbsolutePath(
//                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
//                    fileEntity.getFileName()
@@ -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;
@@ -309,8 +305,9 @@
                return -1;
            }
            removeById(taskId);
            broadcastV2TaskFileService.removeById(taskId);
            broadcastV2TaskTerminalService.removeById(taskId);
            broadcastV2TaskFileService.deleteByTaskId(taskId);
            broadcastV2TaskTerminalService.deleteByTaskId(taskId);
//            broadcastV2TaskTerminalService.removeById(taskId);
            return 0;
        } else {
            return del;