Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-28 bfce748e37a753c729e15dd233600379f504d019

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

@@ -12,6 +12,8 @@
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.PlayPlanNvService;
import com.sandu.ximon.admin.vo.NovaPushResultVO;
import com.sandu.ximon.dao.bo.SchedulesDTO;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.PlayPlanNv;
import com.sandu.ximon.dao.enums.AdministratorEnums;
@@ -56,7 +58,7 @@
    }

    @PostMapping(value = "/push/{plianId}", produces = "application/json;charset=UTF-8")
    public ResponseVO<Object> pushToLed(@PathVariable Long plianId, @RequestBody List<String> playerIds) {
    public ResponseVO<Object> pushToLed(@PathVariable Long plianId, @RequestBody List<NovaPushResultVO> playerIds) {
        return ResponseUtil.success(playPlanNvService.pushToLed(plianId, playerIds));
    }

@@ -66,18 +68,20 @@
            return ResponseUtil.fail("缺少对应用户权限");
        }
        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());
        LambdaQueryWrapper<PlayPlanNv> wrapper = Wrappers.lambdaQuery(PlayPlanNv.class);

        if (SecurityUtils.getClientId() != null) {
            wrapper = wrapper.eq(PlayPlanNv::getUserId, SecurityUtils.getUserId()).or(w -> {
                w.eq(PlayPlanNv::getClientId, SecurityUtils.getUserId());
            });
        }
        wrapper = Wrappers.lambdaQuery(PlayPlanNv.class);
        if (StrUtil.isNotBlank(keyword)) {
            wrapper.like(PlayPlanNv::getName, keyword);
        if (keyword != null && !keyword.isEmpty()) {
            wrapper = wrapper.like(PlayPlanNv::getName, keyword);
        }
        List<PlayPlanNv> list = playPlanNvService.list(wrapper);
        //PlayPlanParam param=new PlayPlanParam();
        list.forEach(plan -> {
            plan.setPlan(JSON.parseObject(plan.getSchedule(), Map.class));
//            plan.setPlan(JSON.parseObject(plan.getSchedule(), Map.class));
            plan.setPlan(JSON.parseArray(plan.getSchedule(), SchedulesDTO.class));
        });
        return ResponseUtil.successPage(list);
    }