Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-08-05 5d208a214181394251e0ebea069a52b81b21a762

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java

@@ -2,7 +2,9 @@

import com.alibaba.fastjson.JSON;
import com.sandu.ximon.admin.config.VnnoxUrl;
import com.sandu.ximon.admin.dto.nova.*;
import com.sandu.ximon.admin.dto.nova.AirDataProgram;
import com.sandu.ximon.admin.dto.nova.PlayerProgram;
import com.sandu.ximon.admin.dto.nova.ProgramSchedule;
import com.sandu.ximon.admin.utils.request.CommonHeader;
import com.sandu.ximon.admin.utils.response.VnnoxResultResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,13 +17,14 @@
    @Autowired
    private RedisUtils redisUtils;

    public static VnnoxProgramAPIUtil getBean(){
    public static VnnoxProgramAPIUtil getBean() {
        return (VnnoxProgramAPIUtil) SpringContextUtil.getBean("VnnoxProgramAPIUtil");
    }


    /**
     * 大气信息推送
     *
     * @param
     * @return
     */
@@ -33,48 +36,51 @@
                new CommonHeader(CommonHeader.JSON, true)
        );
        System.out.println(program.toJson());
        LogUtils.error("节目播放response:"+result);
        return JSON.parseObject(result,VnnoxResultResponse.class);
        LogUtils.error("节目播放response:" + result);
        return JSON.parseObject(result, VnnoxResultResponse.class);
    }


    /**
     * 普通节目播放
     *
     * @param
     * @return
     */
    public VnnoxResultResponse normalProgram(PlayerProgram program) {

        String result = VnnoxRequestUtil.PostWithHeader(
                VnnoxUrl.getUrl(VnnoxUrl.NORMAL_PROGRAM),
                VnnoxUrl.getUrl(VnnoxUrl.WEATHER),
                program.toJson(),
                new CommonHeader(CommonHeader.JSON, true)
        );
        System.out.println(program.toJson());
        LogUtils.error("普通节目播放response:"+result);
        return JSON.parseObject(result,VnnoxResultResponse.class);
        LogUtils.error("普通节目播放response:" + result);
        return JSON.parseObject(result, VnnoxResultResponse.class);
    }

    /**
     * 实时节目播放
     *
     * @param
     * @return
     */
    public VnnoxResultResponse pushProgram(ProgramPush program) {
    public VnnoxResultResponse pushProgram(PlayerProgram program) {

        String result = VnnoxRequestUtil.PostWithHeader(
                VnnoxUrl.getUrl(VnnoxUrl.NORMAL_PROGRAM),
                VnnoxUrl.getUrl(VnnoxUrl.WEATHER),
                program.toJson(),
                new CommonHeader(CommonHeader.JSON, true)
        );
        System.out.println(program.toJson());
        LogUtils.error("普通节目播放response:"+result);
        return JSON.parseObject(result,VnnoxResultResponse.class);
        LogUtils.error("普通节目播放response:" + result);
        return JSON.parseObject(result, VnnoxResultResponse.class);
    }


    /**
     * 定时节目播放
     *
     * @param program
     * @return
     */
@@ -84,27 +90,11 @@
                program.toJson(),
                new CommonHeader(CommonHeader.JSON, true)
        );
        LogUtils.error("定时任务response:"+result);
        return JSON.parseObject(result,VnnoxResultResponse.class);
        LogUtils.error("定时任务response:" + result);
        return JSON.parseObject(result, VnnoxResultResponse.class);
    }


    /**
     * 天气
     * @param program
     * @return
     */
    public VnnoxResultResponse pushWeather(WeatherProgram program) {

        String result = VnnoxRequestUtil.PostWithHeader(
                VnnoxUrl.getUrl(VnnoxUrl.WEATHER),
                program.toJson(),
                new CommonHeader(CommonHeader.JSON, true)
        );
        System.out.println(program.toJson());
        LogUtils.error("天气节目播放response:"+result);
        return JSON.parseObject(result,VnnoxResultResponse.class);
    }


}