功能完善

liuhaonan

2022-03-08 183851818ee5d1e70f65812e9b5178945e9383fd

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

@@ -43,7 +43,7 @@
        playPlan.setName(playPlanParam.getName());
        playPlan.setLedProgramName(playPlanParam.getLedProgramName());
        LEDProgram byId = ledProgramService.getById(playPlanParam.getLedProgramId());
        if(byId==null){
        if (byId == null) {
            throw new BusinessException("ledProgramId有误,未找到该节目");
        }
        playPlan.setLedProgramId(playPlanParam.getLedProgramId());
@@ -55,7 +55,7 @@
        playPlan.setSchedule(JSON.toJSONString(playPlanParam.getSchedule()));
        playPlan.setStartTime(playPlanParam.getStartTime());
        playPlan.setEndTime(playPlanParam.getEndTime());
      //  BeanUtils.copyProperties(playPlanParam, playPlan);
        //  BeanUtils.copyProperties(playPlanParam, playPlan);


        return save(playPlan);
@@ -86,7 +86,7 @@
    }

    public boolean deletePlan(List<Long> ids) {
        for(Long id:ids){
        for (Long id : ids) {
            PlayPlanNv byId = getById(id);
            if (byId == null) {
                throw new BusinessException("部分操作对象不存在");
@@ -95,17 +95,17 @@
        return removeByIds(ids);
    }

    public Map<String, Object> pushToLed(Long planId,List<String> playerIds){
    public Map<String, Object> pushToLed(Long planId, List<String> playerIds) {
//    public PlayerProgram pushToLed(Long planId){
        PushToLed pushToLed = playPlanMapper.pushToLed(planId);
        PlayPlanNv one =getOne(Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getId, planId));
        if(pushToLed==null){
        PlayPlanNv one = getOne(Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getId, planId));
        if (pushToLed == null) {
            throw new BusinessException("未找到该播放计划");
        }
        //List<String> playerIds=new ArrayList<>();
       // playerIds.add("872bb51ae0f06e70c21e913cf3dc9e4d");
        // playerIds.add("872bb51ae0f06e70c21e913cf3dc9e4d");
        //List<Map<String,Object>> pages = JSON.parseObject(pushToLed.getPages(), List.class);
        PlayerProgram program=new PlayerProgram();
        PlayerProgram program = new PlayerProgram();
        program.setPlayerIds(playerIds);
        System.out.println(pushToLed.getPages());

@@ -124,8 +124,8 @@
        VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(playerIds, Integer.valueOf(one.getVolume()).intValue());

        // VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(push);
        List<String> success=new ArrayList<>();
        List<String> fail= new ArrayList<>();
        List<String> success = new ArrayList<>();
        List<String> fail = new ArrayList<>();
//        List<String> success=new ArrayList<>();
//        if(vnnoxResultResponse.getData().getSuccess()!=null&&vnnoxResultResponse.getData()!=null){
//            success = vnnoxResultResponse.getData().getSuccess();
@@ -135,29 +135,29 @@
//        if(vnnoxResultResponse.getData().getFail()!=null&vnnoxResultResponse.getData()!=null){
//            fail= vnnoxResultResponse.getData().getFail();
//        }
        if(vnnoxResultResponse.getData()!=null){
        if (vnnoxResultResponse.getData() != null) {
            success = vnnoxResultResponse.getData().getSuccess();
            fail= vnnoxResultResponse.getData().getFail();
            fail = vnnoxResultResponse.getData().getFail();
        }


       // fail.addAll(vnnoxResult.getFail());
        Map<String,Object> result=new HashMap<>();
        List<LedPlayerEntity> successList= new ArrayList<>();
        List<LedPlayerEntity> faileList= new ArrayList<>();
        for (String playerId:success){
        // fail.addAll(vnnoxResult.getFail());
        Map<String, Object> result = new HashMap<>();
        List<LedPlayerEntity> successList = new ArrayList<>();
        List<LedPlayerEntity> faileList = new ArrayList<>();
        for (String playerId : success) {
            successList.add(ledPlayerEntityService.getByPlayerId(playerId));
        }
        for (String playerId:fail){
            faileList.add( ledPlayerEntityService.getByPlayerId(playerId));
        for (String playerId : fail) {
            faileList.add(ledPlayerEntityService.getByPlayerId(playerId));
        }


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

        return result;
       // return program;
        // return program;

    }

@@ -172,15 +172,15 @@
        }
        Map schedule = JSON.parseObject(byId.getSchedule(), Map.class);
        List pages = JSON.parseObject(byId1.getPages(), List.class);
        Map plan=new HashMap();
        plan.put("planId",byId.getId());
        plan.put("planName",byId.getName());
        plan.put("programId",byId1.getId());
        plan.put("programName",byId1.getName());
        plan.put("planVolume",byId.getVolume());
        plan.put("preview",byId1.getPreview());
        plan.put("pages",pages);
        plan.put("schedule",schedule);
        return  plan;
        Map plan = new HashMap();
        plan.put("planId", byId.getId());
        plan.put("planName", byId.getName());
        plan.put("programId", byId1.getId());
        plan.put("programName", byId1.getName());
        plan.put("planVolume", byId.getVolume());
        plan.put("preview", byId1.getPreview());
        plan.put("pages", pages);
        plan.put("schedule", schedule);
        return plan;
    }
}