Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-04-28 bfce748e37a753c729e15dd233600379f504d019

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

@@ -7,10 +7,15 @@
import com.sandu.ximon.admin.utils.response.*;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import lombok.AllArgsConstructor;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.springframework.stereotype.Component;

import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@Component("VnnoxAPIUtil")
@AllArgsConstructor
@@ -42,21 +47,23 @@

    /**
     * 获取播放器列表
     *
     * @param count 每次读取数量，默认20，取值范围：1~100
     * @param start 从第几条记录开始读取，默认0
     * @return
     */
    public VnnoxPlayerListResponse getPlayerList(Integer count, Integer start) {
    public VnnoxPlayerListResponse getPlayerList(Integer count, Integer start,String name) throws URISyntaxException {

        List<NameValuePair> urlParameters = new ArrayList<>();
        urlParameters.add(new BasicNameValuePair("count",count.toString()));
        urlParameters.add(new BasicNameValuePair("start",start.toString()));
        urlParameters.add(new BasicNameValuePair("name",name));

        String result = VnnoxRequestUtil.GetWithHeader(
                VnnoxUrl.getUrl(VnnoxUrl.GET_PLAYER_LIST),
                new VnnoxGetPlayerListRequest(count, start).toJson(),
                urlParameters,
                new CommonHeader(CommonHeader.JSON, true)
        );
        VnnoxPlayerListResponse response =
                new VnnoxPlayerListResponse().parse(JSON.parseObject(result, CommonResponse.class));
        return response;
        return new VnnoxPlayerListResponse().parse(JSON.parseObject(result,CommonResponse.class));
    }

    /**
@@ -215,4 +222,49 @@
        return response.getData();
    }

    /**
     * 同步播放
     *
     */
    public VnnoxResult syncPlay(List<String> playerId, Integer option) {
        VnnoxBaseRequest request = new VnnoxBaseRequest();
        request.setPlayerIds(playerId);
        request.setOption(option);
        request.setNoticeUrl(VnnoxConstant.SCREEN_SHOT_NOTIFY_URL);

        String result = VnnoxRequestUtil.PostWithHeader(
                VnnoxUrl.getUrl(VnnoxUrl.SIMU_LCAST),
                request.toJson(),
                new CommonHeader(CommonHeader.JSON, true)
        );
        VnnoxResultResponse response = JSON.parseObject(result, VnnoxResultResponse.class);

        return response.getData();
    }

    /**
     * NTP_SYNC
     */
    public VnnoxResult ntpSync(List<String> playerId, boolean enable) {
//        VnnoxBaseRequest request = new VnnoxBaseRequest();
//        request.setPlayerIds(playerId);
//        request.setEnable(enable);
//        request.setServer("ntp1.aliyun.com");
//        request.setNoticeUrl(VnnoxConstant.SCREEN_SHOT_NOTIFY_URL);
        Map map = new HashMap();
        map.put("server", "ntp1.aliyun.com");
        map.put("enable", enable);
        map.put("noticeUrl", VnnoxConstant.SCREEN_SHOT_NOTIFY_URL);
        map.put("playerIds", playerId);
        String s = JSON.toJSONString(map);
        String result = VnnoxRequestUtil.PostWithHeader(
                VnnoxUrl.getUrl(VnnoxUrl.NTP_SYNC),
                s,
                new CommonHeader(CommonHeader.JSON, true)
        );
        VnnoxResultResponse response = JSON.parseObject(result, VnnoxResultResponse.class);

        return response.getData();
    }

}