changes

liuhaonan

2022-11-21 b9ba1dc1b9e156a52dc978bda76347522bd5bc33

changes

 ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/vo/PlayerInfoVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
package com.sandu.ximon.admin.newnova.vo;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

/**
 * @author LiuHaoNan
 * @date 2022/11/21
 */
@NoArgsConstructor
@Data
public class PlayerInfoVO {



    private SourceDTO source;

    private List<TaskArrayDTO> taskArray;

    @NoArgsConstructor
    @Data
    public static class SourceDTO {

        private Integer type;

        private Integer platform;
    }

    @NoArgsConstructor
    @Data
    public static class TaskArrayDTO {

        private String type;

        private Integer action;

        private Integer status;

        private DataDTO data;

        @NoArgsConstructor
        @Data
        public static class DataDTO {

            private Integer width;

            private Integer height;

            private Integer rotation;
        }
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/vo/VideoInfoVO.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,87 @@
package com.sandu.ximon.admin.newnova.vo;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

/**
 * @author LiuHaoNan
 * @date 2022/11/21
 */
@NoArgsConstructor
@Data
public class VideoInfoVO {



    private String type="VIDEO_SOURCE_SWITCH";

    /**
     *     ä¸‹å‘命令的来源
     */
    private SourceDTO source;

    /**
     * æ¨¡å¼ï¼ŒHDMI优先
     */
    private Integer videoMode;

    /**
     *视频源
     */
    private Integer videoSource;

    /**
     *     æ˜¯å¦ç¼©æ”¾ï¼Œtrue为全屏缩放，false为不缩放
     */
    private Boolean isScale;

    /**
     * åç§»X
     */
    private Integer offsetX;

    /**
     *     åç§»Y
     */
    private Integer offsetY;

    /**
     *     ä»»åŠ¡åˆ—表
     */
    private List<ConditionsDTO> conditions;

    @NoArgsConstructor
    @Data
    public static class SourceDTO {

        /**
         * 1：nova自己的平台，0：第三方平台
         */
        private Integer type;

        /**
         *     0：未知，1：移动终端发来的（如手机），2：表示传统电脑，3：表示平板，4：表示web端发来的，5：终端本身
         */
        private Integer platform;
    }

    @NoArgsConstructor
    @Data
    public static class ConditionsDTO {

        private String cron;

        /**
         *     è§†é¢‘源,SOURCE_INSIDE:内部,0;SOURCE_HDMI:HDMI,1
         */
        private Integer source;

        /**
         * è¯¥æ¡å®šæ—¶ä»»åŠ¡æ˜¯å¦ç”Ÿæ•ˆ
         */
        private Boolean enable;
    }
}

 ximon-admin/src/main/resources/application-prod.yml

@@ -4,7 +4,7 @@
spring:
    datasource:
        password: Zhxm2512209
        url: jdbc:mysql://127.0.0.1:3306/ximon_light?useUnicode=true&autoReconnect=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai
        url: jdbc:mysql://39.103.154.108:3306/ximon_light?useUnicode=true&autoReconnect=true&useSSL=false&characterEncoding=utf8&serverTimezone=Asia/Shanghai
        username: ximon
        type: com.alibaba.druid.pool.DruidDataSource
        druid:
@@ -13,7 +13,7 @@
        multipart:
            location: /www/wwwroot/xm/upload_tmp
    redis:
        host: 127.0.0.1
        host: 39.103.154.108
        password: zhxm2512209
        port: 6379
        database: 0
@@ -49,7 +49,7 @@
        enable: true

listenter:  #监听开关
    isOpen: true
    isOpen: false

server-conf:
    ip: 39.103.154.108 # 47.106.172.9/101.132.131.91