From d9a9d8a2dad1d1e57b184bf8f972a03d654d883a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 22 七月 2022 15:07:01 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
index 2c492c3..e3c0de7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
@@ -1,7 +1,9 @@
package com.sandu.ximon.admin.utils;
+import cn.hutool.core.lang.Snowflake;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
+import com.sandu.common.file.FileUploadDto;
import com.sandu.ximon.admin.config.RealtimeServerBean;
import com.sandu.ximon.admin.service.PoleLightemitService;
import com.sandu.ximon.admin.utils.request.*;
@@ -32,6 +34,9 @@
private final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
private OkHttpClient client = new OkHttpClient();
+
+ @Autowired
+ private Snowflake snowflake;
public void init() {
@@ -112,13 +117,14 @@
*
* @param ledCode
*/
- public void clear(String ledCode) {
+ public String clear(String ledCode) {
String postBody = new Gson().toJson(new Clear());
//璇锋眰鍦板潃
String url = realtimeServerBean.getCommand() + ledCode;
//璇锋眰
String result = post(url, postBody);
LogUtils.error("娓呭睆缁撴灉:" + result);
+ return result;
}
/**
@@ -145,36 +151,53 @@
*
* @param screenWidth
* @param screenHeight
- * @param filename
* @param ledCode
*/
- public void postVideo(String screenWidth, String screenHeight, String filename, String ledCode) {
+ public String postFile(String screenWidth, String screenHeight, String ledCode, FileUploadDto fileUploadDto) {
+
+ String fileUrl = fileUploadDto.getFileUrl();
+ String[] split = fileUrl.split("/");
+ String id = split[split.length - 1];
+
//led寮�鍙戞澘涓嬭浇瑙嗛璇锋眰body
DownloadFileToLocal downloadFileToLocal = new DownloadFileToLocal();
- downloadFileToLocal.url = realtimeServerBean.getUrl() + filename;
- downloadFileToLocal.path += filename;
+ downloadFileToLocal.url = realtimeServerBean.getUrl() + "https://ximonsmart.oss-cn-shanghai.aliyuncs.com/" + id;
+ downloadFileToLocal.path += fileUrl;
//led寮�鍙戞澘涓嬭浇瑙嗛璇锋眰
this.post(realtimeServerBean.getCommand() + ledCode, new Gson().toJson(downloadFileToLocal));
//led寮�鍙戞澘瑙嗛鍒楄〃璇锋眰body
SetPlayList setPlayList = new SetPlayList();
- setPlayList.list[0] = "/data/data/com.xixun.xy.conn/files/local/abc/" + filename;
-// setPlayList.pathList[0] = "";
+ setPlayList.list[0] = fileUrl;
+ setPlayList.pathList[0] = ledCode;
try {
setPlayList.width = Integer.valueOf(screenWidth);
setPlayList.height = Integer.valueOf(screenHeight);
} catch (Exception e) {
- return;
+ return "鎺ㄩ�佸け璐�";
}
String postBody = new Gson().toJson(setPlayList);
- //淇濆瓨led鏁版嵁
- poleLightemitService.updateRequestBody(ledCode, postBody);
+
//led寮�鍙戞澘瑙嗛鍒楄〃璇锋眰
- this.post(realtimeServerBean.getCommand() + ledCode, postBody);
+ String post = this.post(realtimeServerBean.getCommand() + ledCode, postBody);
+ LogUtils.error("瑙嗛涓婁紶缁撴灉:----" + post);
+ if (post.contains("does not exist")) {
+ return "鎺ㄩ�佸け璐�";
+ } else {
+ //{"_type":"success","_id":"ce8dc3ff-dc88-43b7-8f55-60abd8700f1a","timestamp":1653555160535}
+ if (post.startsWith("{") && post.endsWith("}") && post.contains("_type\":\"success")) {
+ //淇濆瓨led鏁版嵁
+ poleLightemitService.updateRequestBody(ledCode, postBody);
+ return "鎺ㄩ�佹垚鍔�";
+ } else {
+ return "鎺ㄩ�佸け璐�";
+ }
+ }
}
+
/**
* led灞忓瓧骞曡缃�
*
--
Gitblit v1.9.3