功能完善

liuhaonan

2022-03-08 183851818ee5d1e70f65812e9b5178945e9383fd

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

@@ -43,7 +43,7 @@
    }

    @PostMapping("/update/{planId}")
    public ResponseVO<Object> updateLEDPlan(@PathVariable Long planId,@RequestBody @Validated  PlayPlanParam param) {
    public ResponseVO<Object> updateLEDPlan(@PathVariable Long planId, @RequestBody @Validated PlayPlanParam param) {
        return ResponseUtil.success(playPlanNvService.updatePlan(planId, param));
    }

@@ -52,24 +52,25 @@
        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<String> playerIds) {
        return ResponseUtil.success(playPlanNvService.pushToLed(plianId,playerIds));
    @PostMapping(value = "/push/{plianId}", produces = "application/json;charset=UTF-8")
    public ResponseVO<Object> pushToLed(@PathVariable Long plianId, @RequestBody List<String> playerIds) {
        return ResponseUtil.success(playPlanNvService.pushToLed(plianId, playerIds));
    }

    @GetMapping("/listPlan")
    public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        LambdaQueryWrapper<PlayPlanNv> wrapper = new LambdaQueryWrapper<>();//
        if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())){
           wrapper= Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getUserId,SecurityUtils.getUserId());
        if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
            wrapper = Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getUserId, SecurityUtils.getUserId());
        }
        wrapper=Wrappers.lambdaQuery(PlayPlanNv.class);
        if(StrUtil.isNotBlank(keyword)){
            wrapper.like(PlayPlanNv::getName,keyword);
        wrapper = Wrappers.lambdaQuery(PlayPlanNv.class);
        if (StrUtil.isNotBlank(keyword)) {
            wrapper.like(PlayPlanNv::getName, keyword);
        }
        List<PlayPlanNv> list = playPlanNvService.list(wrapper);
        //PlayPlanParam param=new PlayPlanParam();
        list.forEach(plan->{
        list.forEach(plan -> {
            plan.setPlan(JSON.parseObject(plan.getSchedule(), Map.class));
        });
        return ResponseUtil.successPage(list);