From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ServVnnoxController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ServVnnoxController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ServVnnoxController.java
index 08a3786..27ccbc6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ServVnnoxController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ServVnnoxController.java
@@ -1,10 +1,13 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.config.VnnoxConstant;
+import com.sandu.ximon.admin.param.AsyncStatusParam;
import com.sandu.ximon.admin.param.VnnoxProgressParam;
import com.sandu.ximon.admin.param.VnnoxScreenShotParam;
+import com.sandu.ximon.admin.utils.CountDownLatchUtil;
import com.sandu.ximon.admin.utils.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@@ -19,18 +22,63 @@
@Autowired
private RedisUtils redisUtils;
+ @Autowired
+ private CountDownLatchUtil countDownLatchUtil;
+
+ @AnonymousAccess
@PostMapping("/screenshot")
public ResponseVO<Object> screenshot(@RequestBody VnnoxScreenShotParam vnnoxScreenShot) {
String url = vnnoxScreenShot.getScreenShotUrl().replace("&", "&");
+ System.out.println(vnnoxScreenShot);
redisUtils.set(VnnoxConstant.REDIS_SCREEN_SHOT + vnnoxScreenShot.getPlayerId(), url);
return ResponseUtil.success("ok");
}
+
+ @AnonymousAccess
@PostMapping("/progress")
public ResponseVO<Object> progress(@RequestBody VnnoxProgressParam vnnoxProgress) {
redisUtils.set(VnnoxConstant.REDIS_PROGRESS + vnnoxProgress.getPlayerId(), vnnoxProgress.getPrecess());
return ResponseUtil.success("ok");
}
+
+ @AnonymousAccess
+ @PostMapping("/asyncStatus")
+ public ResponseVO<Object> asyncStatus(@RequestBody AsyncStatusParam asyncStatusParam) {
+ System.out.println(asyncStatusParam.toString());
+ if ("brightnessValue".equals(asyncStatusParam.getCommand())) {
+ //浜害
+ String ratio = asyncStatusParam.getData().getRatio();
+ int i = Integer.parseInt(ratio);
+ redisUtils.set(VnnoxConstant.REDIS_BRIGHTNESS + asyncStatusParam.getPlayerId(), i + "", VnnoxConstant.STATUS_TIME);
+ } else if ("volumeValue".equals(asyncStatusParam.getCommand())) {
+ //闊抽噺
+ String ratio = asyncStatusParam.getData().getRatio();
+ int i = Integer.parseInt(ratio);
+ redisUtils.set(VnnoxConstant.REDIS_VOL + asyncStatusParam.getPlayerId(), i + "", VnnoxConstant.STATUS_TIME);
+ } else if ("videoSourceValue".equals(asyncStatusParam.getCommand())) {
+ //褰撳墠瑙嗛婧�
+ redisUtils.set(VnnoxConstant.VIDEO_SOURCE_VALUE + asyncStatusParam.getPlayerId(), asyncStatusParam.getData().getVideoSource(), VnnoxConstant.STATUS_TIME);
+ } else if ("timeValue".equals(asyncStatusParam.getCommand())) {
+ //褰撳墠鏃跺尯鍜屾椂闂�
+ redisUtils.set(VnnoxConstant.TIME_VALUE_TIME + asyncStatusParam.getPlayerId(), asyncStatusParam.getData().getCurrentTime(), VnnoxConstant.STATUS_TIME);
+ redisUtils.set(VnnoxConstant.TIME_VALUE_TIMEZONE + asyncStatusParam.getPlayerId(), asyncStatusParam.getData().getTimeZone(), VnnoxConstant.STATUS_TIME);
+ } else if ("screenPowerStatus".equals(asyncStatusParam.getCommand())) {
+ //灞忓箷鐘舵��
+ if ("OPEN".equals(asyncStatusParam.getData().getState())) {
+ redisUtils.set(VnnoxConstant.REDIS_SCREEN_STATUS + asyncStatusParam.getPlayerId(), "1", VnnoxConstant.STATUS_TIME);
+ } else {
+ redisUtils.set(VnnoxConstant.REDIS_SCREEN_STATUS + asyncStatusParam.getPlayerId(), "0", VnnoxConstant.STATUS_TIME);
+ }
+ ;
+ } else if ("syncPlayStatus".equals(asyncStatusParam.getCommand())) {
+ //鍚屾鎾斁鐘舵��
+ redisUtils.set(VnnoxConstant.SYNC_PLAY_STATUS + asyncStatusParam.getPlayerId(), asyncStatusParam.getData().getEnable(), VnnoxConstant.STATUS_TIME);
+ }
+ countDownLatchUtil.countDown(asyncStatusParam.getLogid());
+ return ResponseUtil.success("ok");
+ }
+
}
--
Gitblit v1.9.3