From ed037879103f9051f9f7381f02f9d93dc681ea42 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 09 三月 2022 15:44:21 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/param/VnnoxScreenShotParam.java | 14 +++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ServVnnoxController.java | 35 +++++++++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 13 ++----
dao/src/main/java/com/sandu/ximon/dao/domain/LedPlayerEntity.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java | 4 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/param/VnnoxProgressParam.java | 12 ++++++
sandu-common/src/main/java/com/sandu/common/security/config/SecurityConfig.java | 2 +
7 files changed, 71 insertions(+), 11 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LedPlayerEntity.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LedPlayerEntity.java
index 9f1c7ea..0474cfe 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LedPlayerEntity.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/LedPlayerEntity.java
@@ -11,7 +11,7 @@
/**
*
- * @TableName led璇虹摝
+ * @TableName led璇虹摝璁惧
*/
@Data
@TableName(value = "led")
diff --git a/sandu-common/src/main/java/com/sandu/common/security/config/SecurityConfig.java b/sandu-common/src/main/java/com/sandu/common/security/config/SecurityConfig.java
index 7079516..c3be2b8 100644
--- a/sandu-common/src/main/java/com/sandu/common/security/config/SecurityConfig.java
+++ b/sandu-common/src/main/java/com/sandu/common/security/config/SecurityConfig.java
@@ -107,6 +107,8 @@
.antMatchers("/webjars/**").permitAll()
.antMatchers("/*/api-docs").permitAll()
.antMatchers("/v2/api-docs-ext").permitAll()
+ .antMatchers("/serv/vnnox/screenshot").permitAll()
+ .antMatchers("/serv/vnnox/progress").permitAll()
//.antMatchers("/api/wxmp/**").permitAll()
// 鏂囦欢
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java
index be528fd..c52eac0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java
@@ -17,8 +17,8 @@
public static final Long REDIS_MAX_SAVE_TIME = 180 * 24 * 60 * 60L;
public static final Long SCREEN_SHOT_TIMEOUT = 30 * 60L;
- public static final String NOTIFY_URL = "http://112.74.63.130:6379/XMPoleManager/serv/vnnox/progress";
- public static final String SCREEN_SHOT_NOTIFY_URL = "http://112.74.63.130:6379/XMPoleManager/serv/vnnox/screenshot"; //瑕佹敼
+ public static final String NOTIFY_URL = "http://112.74.63.130:20017/serv/vnnox/progress";
+ public static final String SCREEN_SHOT_NOTIFY_URL = "http://112.74.63.130:20017/serv/vnnox/screenshot"; //瑕佹敼
public static final String username = "zhxm";
public static final String password = "xm2512209.";
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
new file mode 100644
index 0000000..15753f9
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ServVnnoxController.java
@@ -0,0 +1,35 @@
+package com.sandu.ximon.admin.controller;
+
+import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.config.VnnoxConstant;
+import com.sandu.ximon.admin.param.VnnoxProgressParam;
+import com.sandu.ximon.admin.param.VnnoxScreenShotParam;
+import com.sandu.ximon.admin.utils.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/serv/vnnox")
+public class ServVnnoxController {
+
+ @Autowired
+ private RedisUtils redisUtils;
+
+ @PostMapping("/screenshot")
+ public ResponseVO<Object> screenshot(@RequestBody VnnoxScreenShotParam vnnoxScreenShot) {
+ String url = vnnoxScreenShot.getScreenShotUrl().replace("&", "&");
+ redisUtils.set(VnnoxConstant.REDIS_SCREEN_SHOT + vnnoxScreenShot.getPlayerId(), url, VnnoxConstant.SCREEN_SHOT_TIMEOUT);
+ return ResponseUtil.success("ok");
+ }
+
+ @PostMapping("/progress")
+ public ResponseVO<Object> progress(@RequestBody VnnoxProgressParam vnnoxProgress) {
+ redisUtils.set(VnnoxConstant.REDIS_PROGRESS + vnnoxProgress.getPlayerId(), vnnoxProgress.getPrecess());
+ return ResponseUtil.success("ok");
+ }
+
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/VnnoxProgressParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/VnnoxProgressParam.java
new file mode 100644
index 0000000..96926ec
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/VnnoxProgressParam.java
@@ -0,0 +1,12 @@
+package com.sandu.ximon.admin.param;
+
+import lombok.Data;
+
+@Data
+public class VnnoxProgressParam {
+
+ private String playerId;
+
+ private Double precess;
+
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/param/VnnoxScreenShotParam.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/VnnoxScreenShotParam.java
new file mode 100644
index 0000000..1a53e27
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/param/VnnoxScreenShotParam.java
@@ -0,0 +1,14 @@
+package com.sandu.ximon.admin.param;
+
+import lombok.Data;
+
+@Data
+public class VnnoxScreenShotParam {
+ // 瀵瑰簲鐨勬挱鏀惧櫒id
+ private String playerId;
+ // 褰撳墠鎾斁鍣ㄧ殑鏃堕棿淇℃伅
+ private String playerTime;
+ // 褰撳墠鎾斁鍣ㄧ殑灞忓箷鎴浘鍥剧墖鍦板潃,鍥剧墖閾炬帴澶辨晥鏃堕棿涓�2灏忔椂
+ private String screenShotUrl;
+
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
index 51b248f..9ec7c6f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
@@ -36,14 +36,6 @@
public boolean insert(ProgramPro programPro) {
- // SimpleDateFormat sdf=new SimpleDateFormat("yy-MM-dd HH:mm:ss");
- // Date date = new Date();
-// Program program = new Program();
-// try {
-// program = JsonUtil.convertJsonStringToObject(json,Program.class);
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
String json = JsonUtil.jsonObj2Sting(programPro);
PoleXixunPlayerEntity poleXixunPlayer = new PoleXixunPlayerEntity();
poleXixunPlayer.setProgramCode(programPro.get_id());
@@ -84,6 +76,11 @@
return programPro;
}
+ /**
+ * 鎺ㄩ�佽妭鐩�
+ * @param programId
+ * @param lightemitIds
+ */
public void videoXixunPlayer(long programId, List<Long> lightemitIds) {
ProgramPro pro = new ProgramPro();
--
Gitblit v1.9.3