fix

zhanzhiqin

2022-05-12 f2b8a2fc1b360eb757cf9f8e2ed9f5d19f1f7f4c

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

@@ -82,7 +82,6 @@
            SchedulesDTO openDto = new SchedulesDTO();



            SchedulesDTO closeDto = new SchedulesDTO();

            openDto.setStartDate(schedule.get("startDate").toString());
@@ -93,13 +92,13 @@
            /**
             * 判断时间的先后
             */
            String startTime = openDto.getStartDate()+" " +plans.get(i).getStartTime();
            String endTime =openDto.getEndDate()+ " " +plans.get(i).getEndTime();
            String startTime = openDto.getStartDate() + " " + plans.get(i).getStartTime();
            String endTime = openDto.getEndDate() + " " + plans.get(i).getEndTime();

            //转换成时间戳
            long startTimeStamp = DateUtil.parse(startTime, DatePattern.NORM_DATETIME_PATTERN).getTime();
            long endTimeStamp = DateUtil.parse(endTime, DatePattern.NORM_DATETIME_PATTERN).getTime();
            if(startTimeStamp>endTimeStamp){
            if (startTimeStamp > endTimeStamp) {
                throw new BusinessException("开始时间不能大于结束时间");
            }

@@ -148,18 +147,14 @@
    }

    public Map<String, Object> pushToLed(Long planId, List<NovaPushResultVO> nova) {
//    public PlayerProgram pushToLed(Long planId){
        PushToLed pushToLed = playPlanMapper.pushToLed(planId);
        PlayPlanNv one = getOne(Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getId, planId));
        if (pushToLed == null) {
            throw new BusinessException("未找到该播放计划");
        }
        List<String> playerIds = new ArrayList<>();
        nova.forEach(
                n -> {
                    playerIds.add(n.getPlayerId());
                }
        );
        nova.forEach(n -> {
            playerIds.add(n.getPlayerId());
        });

        PlayerProgram program = new PlayerProgram();
        program.setPlayerIds(playerIds);
@@ -173,26 +168,18 @@
        Map map = JSON.parseObject(pushToLed.getSchedule(), Map.class);
        map.get("plans");
        List<Plans> plans = JSON.parseArray(map.get("plans").toString(), Plans.class);
        plans.forEach(
                p -> {
                    //删除后两位字符串
                    p.setStartTime(p.getStartTime().substring(0, p.getStartTime().length() - 3));
                    p.setEndTime(p.getEndTime().substring(0, p.getEndTime().length() - 3));
                }
        );
        plans.forEach(p -> {
            //删除后两位字符串
            p.setStartTime(p.getStartTime().substring(0, p.getStartTime().length() - 3));
            p.setEndTime(p.getEndTime().substring(0, p.getEndTime().length() - 3));
        });
        System.out.println(plans + "plans11111");
        map.put("plans", plans);
        program.setSchedule(map);
        //获取定时开关屏幕
//        program.setSchedules((JSON.parseArray(pushToLed.getSchedule(), SchedulesDTO.class)));


        // Map map = JSON.parseObject(pushToLed.getSchedule(), Map.class);

        program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
//        VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.timeProgram(program);
        VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(program);
        vnnoxAPIUtil.volChange(playerIds, Integer.valueOf(one.getVolume()).intValue());
        vnnoxAPIUtil.volChange(playerIds, Integer.valueOf(pushToLed.getVolume()).intValue());

        List<String> success = new ArrayList<>();
        List<String> fail = new ArrayList<>();
@@ -207,22 +194,18 @@
        List<NovaPushResultVO> faileList = new ArrayList<>();
        List<String> finalSuccess = success;
        List<String> finalFail = fail;
        nova.forEach(
                n -> {
                    if (finalSuccess.contains(n.getPlayerId())) {
                        successList.add(n);
                    } else if (finalFail.contains(n.getPlayerId())) {
                        faileList.add(n);
                    }
                }

        );
        nova.forEach(n -> {
            if (finalSuccess.contains(n.getPlayerId())) {
                successList.add(n);
            } else if (finalFail.contains(n.getPlayerId())) {
                faileList.add(n);
            }
        });

        result.put("success", successList);
        result.put("fail", faileList);

        return result;
        // return program;
    }