changes

liuhaonan

2022-11-04 2611d27616bdbea6331f75a0147bd67c95f2eb0e

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

@@ -65,12 +65,19 @@
        return ResponseUtil.success(playPlanNvService.deletePlan(plianIds));
    }

    @PostMapping(value = "/push/{plianId}", produces = "application/json;charset=UTF-8")
    public ResponseVO<Object> pushToLed(@PathVariable Long plianId, @RequestBody List<NovaPushResultVO> playerIds) {
    /**
     * 定时节目
     *
     * @param planId
     * @param playerIds
     * @return
     */
    @PostMapping(value = "/push/{planId}", produces = "application/json;charset=UTF-8")
    public ResponseVO<Object> pushToLed(@PathVariable Long planId, @RequestBody List<NovaPushResultVO> playerIds) {
        if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_PUSH.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(playPlanNvService.pushToLed(plianId, playerIds));
        return ResponseUtil.success(playPlanNvService.pushToLed(planId, playerIds));
    }


@@ -81,6 +88,23 @@
        }
        return ResponseUtil.success(playPlanNvService.pushSchedule(planId, playerIds));
    }


    /**
     * 实时节目
     *
     * @param pid
     * @param playerIds
     * @return
     */
    @PostMapping(value = "/pushProgram/{pid}", produces = "application/json;charset=UTF-8")
    public ResponseVO<Object> pushProgram(@PathVariable Long pid, @RequestBody List<NovaPushResultVO> playerIds) {
        if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_PUSH.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(playPlanNvService.pushProgram(pid, playerIds));
    }


    @GetMapping("/listPlan")
    public ResponseVO<Object> list(BaseConditionVO baseConditionVO,
@@ -117,7 +141,9 @@
        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;

        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
        if (baseConditionVO != null) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
        }
        LambdaQueryWrapper<PlayPlanNv> wrapper = Wrappers.lambdaQuery(PlayPlanNv.class);

        if (SecurityUtils.getClientId() != null) {
@@ -130,9 +156,7 @@
        }
        List<PlayPlanNv> list = playPlanNvService.list(wrapper);
        list.forEach(plan -> {
//            plan.setPlan(JSON.parseObject(plan.getSchedule(), Map.class));
            plan.setPlan(JSON.parseObject(plan.getSchedules(), List.class));
//            plan.setPlan(JSON.parseArray(plan.getSchedule(), SchedulesDTO.class));
        });
        return ResponseUtil.successPage(list);
    }