From dca94edc9cd0681be081e36b0dba3bbe0f581ea0 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 19 七月 2022 11:29:06 +0800
Subject: [PATCH] 新需求
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java | 73 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
index e6f118b..3eb4327 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -3,16 +3,14 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.gson.Gson;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.file.FileUploadDto;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.config.RealtimeServerBean;
import com.sandu.ximon.admin.entity.*;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.utils.FileUtil;
-import com.sandu.ximon.admin.utils.HtmlTemplateUtils;
-import com.sandu.ximon.admin.utils.LightemitUtils;
-import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
+import com.sandu.ximon.admin.utils.*;
import com.sandu.ximon.admin.vo.EquipmentInfomation;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
@@ -393,28 +391,26 @@
* led涓婁紶瑙嗛
*
* @param lightemitControlCode
- * @param filename
- * @param path
- * @param userName
- * @throws IOException
*/
@Async("taskExecutor")
- public void videoUpload(String lightemitControlCode, String filename, String path, String userName) throws IOException {
+ public String videoUpload(String lightemitControlCode, FileUploadDto fileUploadDto, Integer type) {
//鑾峰彇灞忓箷瀹�
String screenWidth = lightemitUtils.getScreenWidth(lightemitControlCode);
String screenHeight = lightemitUtils.getScreenHeight(lightemitControlCode);
//鍙戦�佽棰戣嚦寮�鍙戞澘骞舵挱鏀�
- lightemitUtils.postVideo(screenWidth, screenHeight, filename, lightemitControlCode);
+ String fileUrl = fileUploadDto.getFileUrl();
+ String[] split = fileUrl.split("/");
+ String id = split[split.length - 1];
+ String result = this.videoXixunPlayer(lightemitControlCode, id, fileUploadDto.getFileSize(), fileUploadDto.getMd5(), type, fileUploadDto.getFileType(), 999999);
- //娓呭睆
- lightemitUtils.clear(lightemitControlCode);
-
+ LogUtils.error("涓婁紶鎾斁缁撴灉:" + result);
+ return result;
}
@Async("taskExecutor")
- public void videoXixunPlayer(String lightemitControlCode, String ip, String filename, Long filesize, Integer videoTime) {
+ public String videoXixunPlayer(String lightemitControlCode, String filename, Long filesize, String md5, Integer type, String fileType, Integer videoTime) {
//鑾峰彇灞忓箷瀹�
Integer screenWidth = Integer.valueOf(lightemitUtils.getScreenWidth(lightemitControlCode));
Integer screenHeight = Integer.valueOf(lightemitUtils.getScreenHeight(lightemitControlCode));
@@ -429,18 +425,23 @@
source.set_id(UUID.randomUUID().toString());
//璇锋眰澶存嫾鎺ヨID涓鸿璧勬簮鐨勫畬鏁翠笅杞藉湴鍧�
source.setId(filename);
- //璁剧疆璧勬簮绫诲瀷锛屽叾浠栬祫婧愮被鍨嬭鍙傝�儀ixunplayer鑺傜洰json璇存槑鏂囨。
- source.set_type("Video");
+ if (type == 1) {
+ //璁剧疆璧勬簮绫诲瀷锛屽叾浠栬祫婧愮被鍨嬭鍙傝�儀ixunplayer鑺傜洰json璇存槑鏂囨。
+ source.set_type("Video");
+ source.setMime("video/mp4");
+ } else {
+ source.set_type("Image");
+ source.setMime("image/jpeg");
+ }
//璧勬簮鍚庣紑鍚�
- source.setFileExt(".mp4");
+ source.setFileExt(fileType);
//璧勬簮楂樺害
source.setHeight(screenHeight);
//璧勬簮瀹藉害
source.setWidth(screenWidth);
//璺濆乏
source.setLeft(0);
- source.setMd5("dd135d5d2d44d619a542db773ab529a4");
- source.setMime("video/mp4");
+ source.setMd5(md5);
source.setName(filename);
source.setPlayTime(0); //鎾斁璧峰鏃堕棿
source.setSize(filesize); //璧勬簮瀛楄妭鏁帮紝瑕佺簿鍑�
@@ -454,7 +455,7 @@
List<Layer> list1 = new ArrayList<Layer>();
list1.add(layer);
pro.setLayers(list1);
- pro.setName("demo"); //鑺傜洰鍚嶇О
+ pro.setName("鏂囦欢涓婁紶鎾斁"); //鑺傜洰鍚嶇О
pro.setOthers(true);//濡傛灉涓簍rue锛屽垯璇ヨ妭鐩潵鑷涓夋柟鎺ュ彛锛屼笉鏄潵鑷垜浠嚜宸辩殑web锛屼簩娆″紑鍙戣鍔″繀璧嬪�间负true
pro.setTotalSize(filesize); //鎵�鏈夎祫婧愭�诲瓧鑺傛暟
pro.setVersion(0); //楂樼骇鑺傜洰=0锛岀畝鏄撹妭鐩�=2
@@ -470,17 +471,29 @@
task.setItems(list2);
command.setId(UUID.randomUUID().toString());
//杩欓噷鏄笅鏂圭殑post鍥炶皟鍦板潃锛岄渶瑕佷慨鏀笽P鍦板潃
- command.setNotificationURL("http://" + ip + ":" + port + "/machine-fast/serv/download/getJSON");
+ command.setNotificationURL("");
//璧勬簮涓嬭浇閾炬帴鐨勮姹傚ご
- command.setPreDownloadURL("http://" + ip + ":" + port + "/machine-fast/serv/download/downloadFile/");
+ command.setPreDownloadURL("https://ximonsmart.oss-cn-shanghai.aliyuncs.com/");
command.setTask(task);
xixun.set_id(UUID.randomUUID().toString());
xixun.setCommand(command);
xixun.setType("commandXixunPlayer"); //鍛戒护鍥哄畾绫诲瀷锛屼笉鍙洿鏀�
String jsondata = new Gson().toJson(xixun);
- lightemitUtils.clear(lightemitControlCode);
- poleLightemitDao.updateRequestBody(lightemitControlCode, jsondata);
- lightemitUtils.post(realtimeServerBean.getCommand() + lightemitControlCode, jsondata);
+ String clearResult = lightemitUtils.clear(lightemitControlCode);
+ if (clearResult.contains("does not exist")) {
+ return "鎺ㄩ�佸け璐�";
+ } else {
+ poleLightemitDao.updateRequestBody(lightemitControlCode, jsondata);
+ String post = lightemitUtils.post(realtimeServerBean.getCommand() + lightemitControlCode, jsondata);
+ LogUtils.error("缁撴灉:" + post);
+ //{"_type":"success","_id":"ce8dc3ff-dc88-43b7-8f55-60abd8700f1a","timestamp":1653555160535}
+ if (post.startsWith("{") && post.endsWith("}") && post.contains("_type\":\"success")) {
+ return "鎺ㄩ�佹垚鍔�";
+ } else {
+ return "鎺ㄩ�佸け璐�";
+ }
+
+ }
}
/**
@@ -492,16 +505,6 @@
public void updateRequestBody(String ledCode, String postBody) {
baseMapper.updateRequestBody(ledCode, postBody);
}
-
-// /**
-// * 鏍规嵁led灞忕紪鐮佽幏鍙栫伅鏉嗘墍鏈変俊鎭�
-// *
-// * @param ledCode
-// * @return
-// */
-// public PoleStreetlightEntity getStreetlightByLedCode(String ledCode) {
-// return baseMapper.getStreetlightByLedCode(ledCode);
-// }
/**
--
Gitblit v1.9.3