changes

liuhaonan

2022-11-24 f37d9ab49c0e3488a05a97d369e19e027d9fd37c

changes

 dao/src/main/java/com/sandu/ximon/dao/domain/NewNovaLed.java

@@ -102,7 +102,7 @@
     * åŒæ­¥çŠ¶æ€ 0未同步  1已同步  -1 åŒæ­¥å¤±è´¥
     */
    @TableField(exist = false)
    private Integer sync = 0;
    private Integer sync = -1;

    /**
     * å±å¹•å®½

 ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedController.java

@@ -7,6 +7,7 @@
import com.sandu.ximon.admin.newnova.grouping.NewNovaGroupService;
import com.sandu.ximon.admin.newnova.param.NewNovaLedParam;
import com.sandu.ximon.admin.newnova.param.NewNovaStatusParam;
import com.sandu.ximon.admin.newnova.program.LEDInfoParam;
import com.sandu.ximon.admin.newnova.utils.NovaAPIUtil;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -83,6 +84,18 @@
        return ResponseUtil.success(newNovaLedService.listLed(baseConditionVO, keyword, groupId, onlineStatus));
    }


    /**
     * çŠ¶æ€åˆ—表
     */
    @PostMapping("/ledInfo")
    public ResponseVO ledInfo(@RequestBody LEDInfoParam param) {
        if (!permissionConfig.check(MenuEnum.LED_NEW_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.success(newNovaLedService.infoList(param));
    }

    /**
     * è¯¦ç»†ä¿¡æ¯
     *

 ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/led/NewNovaLedService.java

@@ -11,6 +11,7 @@
import com.sandu.ximon.admin.newnova.conf.ProgramPathConfig;
import com.sandu.ximon.admin.newnova.param.NewNovaLedParam;
import com.sandu.ximon.admin.newnova.param.ProgramPrarm;
import com.sandu.ximon.admin.newnova.program.LEDInfoParam;
import com.sandu.ximon.admin.newnova.program.NewNovaProgramService;
import com.sandu.ximon.admin.newnova.utils.NovaAPIUtil;
import com.sandu.ximon.admin.newnova.vo.ProWHVO;
@@ -129,20 +130,8 @@
        List<NewNovaLed> newNovaListBos = baseMapper.listLed(keyword, groupId, SecurityUtils.getClientId());
        //获取在线状态
        List<NewNovaLed> onLine = instanceUtil.getOnlineStatus(newNovaListBos, onlineStatus);
        //获取屏幕开关
        instanceUtil.getScreenPowerState(onLine);
        //获取音量
        instanceUtil.getVolumeState(onLine);
        //获取亮度
        instanceUtil.getScreenBrightness(onLine);
        //获取同步状态
        instanceUtil.getSync(onLine);
        //获取分辨率
        instanceUtil.getDisplayInfoAsync(onLine);
        //获取时区
        instanceUtil.getTimezone(onLine);
        //获取视频源
        instanceUtil.getVideoInfoAsync(onLine);

        updateBatchById(onLine);
        return onLine;
@@ -390,4 +379,64 @@
    }


    /**
     * èŽ·å–状态信息
     *
     * @param param
     * @return
     */
    public Object infoList(LEDInfoParam param) {

        NovaAPIUtil instanceUtil = NovaAPIUtil.getInstanceUtil();

        List<NewNovaLed> newNovaLeds = listByIds(param.getLedIds());
        param.setLedList(newNovaLeds);

        switch (param.getType()) {
            case "all":
                //获取屏幕开关
                instanceUtil.getScreenPowerState(param.getLedList());
                //获取音量
                instanceUtil.getVolumeState(param.getLedList());
                //获取亮度
                instanceUtil.getScreenBrightness(param.getLedList());
                //获取同步状态
                instanceUtil.getSync(param.getLedList());
                //获取分辨率
                instanceUtil.getDisplayInfoAsync(param.getLedList());
                //获取时区
                instanceUtil.getTimezone(param.getLedList());
                //获取视频源
                instanceUtil.getVideoInfoAsync(param.getLedList());
                break;
            case "volumeValue":
                //获取音量
                instanceUtil.getVolumeState(param.getLedList());
                break;
            case "brightnessValue":
                //获取亮度
                instanceUtil.getScreenBrightness(param.getLedList());
                break;
            case "videoSourceValue":
                //获取视频源
                instanceUtil.getVideoInfoAsync(param.getLedList());
                break;
            case "timeValue":
                //获取时区
                instanceUtil.getTimezone(param.getLedList());
                break;
            case "screenPowerStatus":
                //获取屏幕开关
                instanceUtil.getScreenPowerState(param.getLedList());
                break;
            case "syncPlayStatus":
                //获取同步状态
                instanceUtil.getSync(param.getLedList());
                break;
            default:
        }


        return param.getLedList();
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/program/LEDInfoParam.java

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

import com.sandu.ximon.dao.domain.NewNovaLed;
import lombok.Data;

import java.util.List;

/**
 * @author LiuHaoNan
 * @date 2022/11/23
 */
@Data
public class LEDInfoParam {

    private List<NewNovaLed> ledList;

    private List<Long> ledIds;

    private String type;
}