changes

liuhaonan

2022-10-25 dda268997ca8f8a364f7c19b45d7a43a50a98efe

changes

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java

@@ -14,7 +14,6 @@
import com.sandu.ximon.admin.dto.DeviceStatusDto;
import com.sandu.ximon.admin.param.*;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.AirEquipmentService;
import com.sandu.ximon.admin.service.IpVolumeService;
import com.sandu.ximon.admin.service.MonitorService;
@@ -398,7 +397,7 @@
            throw new BusinessException("播放时间需大于零且小于86400000 !");
        }
        VnnoxResult vnnoxResult = poleService.pushAirDataToNova(param);
        if (vnnoxResult.getSuccess().size() != 0) {
        if (vnnoxResult == null && vnnoxResult.getSuccess() != null && vnnoxResult.getSuccess().size() != 0) {
            return ResponseUtil.success("推送成功");
        } else {
            return ResponseUtil.fail("推送失败");

 ximon-admin/src/main/java/com/sandu/ximon/admin/minio/utils/MinIoUtil.java

@@ -4,10 +4,9 @@
import com.sandu.ximon.admin.config.VnnoxConstant;
import com.sandu.ximon.admin.minio.config.MinIoPolicy;
import com.sandu.ximon.admin.minio.entity.MinIoConstant;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.SpringContextUtils;


import io.minio.*;
import io.minio.errors.*;
import io.minio.messages.Bucket;
@@ -262,7 +261,18 @@
        minioClient.putObject(bucketName, fileName, is, new PutObjectOptions(is.available(), -1));
        is.close();
        LogUtils.error("上传总时间：" + (System.currentTimeMillis() - start) + "ms");
        return getFileUrl(bucketName, fileName);
        if (SecurityUtils.getClientId() == null) {
            return MinIoConstant.getAbsolutePath(
                    MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
                    fileName
            );
        } else {
            return MinIoConstant.getAbsolutePath(
                    MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName() + SecurityUtils.getUserId(),
                    fileName
            );
        }
//        return getFileUrl(bucketName, fileName);
    }

    /**

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

@@ -107,24 +107,11 @@
            if (fileEntity == null) {
                throw new BusinessException("fileId为" + fileId + "的文件不存在");
            }
            if (fileEntity.getUserId() == null && fileEntity.getClientId() != null) {
                fileEntity.setUserId(fileEntity.getClientId());
            }
            String absolutePath;
            absolutePath = MinIoConstant.getAbsolutePath(
                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
                    fileEntity.getFileName()
            );
            if (fileEntity.getUserId() == null && fileEntity.getClientId() != null) {
                absolutePath = MinIoConstant.getAbsolutePath(
                        MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
                        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);
@@ -250,22 +237,11 @@
            taskFileEntity.setFileId(fileId);

            IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
            String absolutePath;
            absolutePath = MinIoConstant.getAbsolutePath(
                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
                    fileEntity.getFileName()
            );
            if (fileEntity.getUserId() == null && fileEntity.getClientId() == null) {
                absolutePath = MinIoConstant.getAbsolutePath(
                        MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
                        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);

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

@@ -1303,17 +1303,17 @@
        Long poleId = param.getPoleId();
        Pole pole = getById(poleId);
        PoleBinding air = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId).eq(PoleBinding::getDeviceType, 3));
        PoleBinding nova = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId).eq(PoleBinding::getDeviceType, 1));
        LedPlayerEntity LED = SpringContextHolder.getBean(LedPlayerEntityService.class).getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, nova.getDeviceCode()));
        if (pole == null) {
            throw new BusinessException("灯杆不存在");
        }
        if (air == null) {
            throw new BusinessException("未绑定大气监测设备");
        }
        PoleBinding nova = poleBindingService.getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId).eq(PoleBinding::getDeviceType, 1));
        if (nova == null) {
            throw new BusinessException("未绑定nova设备");
        }
        LedPlayerEntity LED = SpringContextHolder.getBean(LedPlayerEntityService.class).getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, nova.getDeviceCode()));
        if (pole == null) {
            throw new BusinessException("灯杆不存在");
        }
        //获取大气监测数据
        A5AtmosphereHeartbeatReportInnerFrame.HeartBeatDataPackage data = SpringContextHolder.getBean(AirDataService.class).getDataByPoleid(poleId);
        //推送数据

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java

@@ -37,7 +37,7 @@
                new CommonHeader(CommonHeader.JSON, true)
        );
        System.out.println(program.toJson());
        LogUtils.error("节目播放response:" + result);
        System.out.println("节目播放response:" + JSON.parse(result));
        return JSON.parseObject(result, VnnoxResultResponse.class);
    }