2021与蓝度共同重构项目,服务端
liuhaonan
2022-04-22 1b77ad40456a5c8ef066e1267e3751f769385e8a
首页
已修改5个文件
49 ■■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxUrl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/PlayerProgram.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxUrl.java
@@ -21,6 +21,8 @@
    public static String SCREEN_SHOT = "/v1/player/control/screenshot";
    //  重启
    public static String REBOOT = "/v1/player/immediateControl/reboot";
    // 下发定时任务
    public static String TIMING_CONTROL = "/v1/player/timingControl/screenStatus";
    public static String getUrl(String urlSuffix) {
        return url + urlSuffix;
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
@@ -12,6 +12,8 @@
import com.sandu.ximon.admin.utils.request.PlayerProgram;
import com.sandu.ximon.admin.utils.response.VnnoxResult;
import com.sandu.ximon.admin.utils.response.VnnoxResultResponse;
import com.sandu.ximon.admin.vo.NovaOpenVO;
import com.sandu.ximon.admin.vo.PlansVO;
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.PlayPlanNvMapper;
@@ -115,9 +117,11 @@
        System.out.println(JSON.parseArray(pushToLed.getPages(), Map.class));
        program.setPages(JSON.parseObject(pushToLed.getPages(), List.class));
        program.setSchedule(JSON.parseObject(pushToLed.getSchedule(), Map.class));
        program.setSchedules(JSON.parseObject(pushToLed.getSchedule(), Map.class));
        Map map = JSON.parseObject(pushToLed.getSchedule(), Map.class);
        program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
        VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(program);
        VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.timeProgram(program);
        VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(playerIds, Integer.valueOf(one.getVolume()).intValue());
        // VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(push);
@@ -143,12 +147,32 @@
        result.put("success", successList);
        result.put("fail", faileList);
        result.put("program", program);
        return result;
        // return program;
    }
    /**
     * 解析定时
     * @param
     * @return
     */
    public List<Map<String, Object>> parseSchedule(Map map) {
//        map.get("startDate");
//        map.get("endDate");
//        List plans = (List<PlansVO>) map.get("plans");
//
//        NovaOpenVO Open1 = new NovaOpenVO();
//        Open1.setStartDate(map.get("startDate").toString());
//        Open1.setEndDate(map.get("endDate").toString());
//        Open1.setExecTime();
        return null;
    }
    public Object getByPlanId(Long planId) {
        PlayPlanNv byId = getById(planId);
        if (byId == null) {
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -154,7 +154,7 @@
            //再绑定
            PoleBindingParam poleBindingParam = new PoleBindingParam();
            poleBindingParam.setDeviceCode(poleLightemit.getLightemitControlCode());
            poleBindingParam.setDeviceType(1);
            poleBindingParam.setDeviceType(10);
            poleBindingParam.setDeviceName(poleLightemit.getLightemitName());
            poleBindingService.bindPole(poleLightemit.getPoleId(), poleBindingParam);
        }
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java
@@ -36,4 +36,19 @@
        LogUtils.error("节目播放response:"+result);
        return JSON.parseObject(result,VnnoxResultResponse.class);
    }
    /**
     * 定时节目播放
     * @param program
     * @return
     */
    public VnnoxResultResponse timeProgram(PlayerProgram program) {
        String result = VnnoxRequestUtil.PostWithHeader(
                VnnoxUrl.getUrl(VnnoxUrl.TIMING_CONTROL),
                program.toJson(),
                new CommonHeader(CommonHeader.JSON, true)
        );
        LogUtils.error("定时节目播放response:"+result);
        return JSON.parseObject(result,VnnoxResultResponse.class);
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/PlayerProgram.java
@@ -15,7 +15,7 @@
    //  需要处理的播放器ID集合,最多支持100个播放器同时处理
    private List<String> playerIds;
    //  播放时间排期,如果为空,会全天24小时循环播放
    private  Map schedule;
    private  Map schedules;
    //  需要播放的页面内容集合
    private  List<Map<String,Object>> pages ;
    //  节目下载进度通知接口,会通过此接口将节目的下载进度发给客户,接口的响应时间不能超过3s