From d8d6ef0d3031053361284b04ddafb48ef99ae679 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 26 五月 2022 14:16:51 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 50 ++++++++-----------------
ximon-admin/src/main/java/com/sandu/ximon/admin/entity/SourcePro.java | 18 +++++----
2 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/SourcePro.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/SourcePro.java
index 80e80d1..f40606b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/SourcePro.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/SourcePro.java
@@ -10,23 +10,23 @@
private String _type;
- private String md5; //绱犳潗濡傛灉鏈夊ぇ灏忛渶瑕佽绠楀畠鐨刴d5
+ private String md5; //绱犳潗濡傛灉鏈夊ぇ灏忛渶瑕佽绠楀畠鐨刴d5
- private String name; //绱犳潗鍚嶅瓧
+ private String name; //绱犳潗鍚嶅瓧
- private int left; //鏄剧ず鍦ㄥ乏涓婅鐨勫潗鏍�
+ private int left; //鏄剧ず鍦ㄥ乏涓婅鐨勫潗鏍�
private int top;
- private int width; //瀹介珮
+ private int width; //瀹介珮
private int height;
- private long size; //鏂囦欢澶у皬
+ private long size; //鏂囦欢澶у皬
- private int playTime; //璧峰鎾斁鏃堕棿
+ private int playTime; //璧峰鎾斁鏃堕棿
- private int timeSpan; //鎸佺画鎾斁鏃堕暱
+ private int timeSpan; //鎸佺画鎾斁鏃堕暱
private String fileExt = "";
@@ -50,11 +50,13 @@
private String backgroundColor = ""; // 澶氳鏂囨湰鑳屾櫙棰滆壊
- private String language ; //鏃堕挓璇█
+ private String language; //鏃堕挓璇█
private Integer timezone; //鏃堕挓鏃跺尯
private String city; //澶╂皵鍩庡競
private Integer code; //鍩庡競浠ｇ爜
+
+ private String url; //璧勬簮鏂囦欢涓嬭浇鍦板潃
}
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 2086795..c71c961 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
@@ -69,6 +69,18 @@
}
public boolean insert(ProgramPro programPro) {
+ programPro.getLayers().forEach(
+ layerPro -> {
+ layerPro.getSources().forEach(
+ sourcePro -> {
+ long fileId = Long.parseLong(sourcePro.getId());
+ LedSFile file = xiXunFileService.getById(fileId);
+ sourcePro.setUrl(file.getFileUrl());
+ sourcePro.setMd5(file.getMd5());
+ }
+ );
+ }
+ );
String json = JsonUtil.jsonObj2Sting(programPro);
PoleXixunPlayerEntity poleXixunPlayer = new PoleXixunPlayerEntity();
poleXixunPlayer.setProgramCode(programPro.get_id());
@@ -148,36 +160,6 @@
}
-// public Object getProgram(String json) {
-//// PoleXixunPlayerEntity byId = getById(pid);
-// List<Long> fileIds = new ArrayList<>();
-// List<LedSFile> file = new ArrayList<>();
-// if (json == null) {
-// throw new BusinessException("鏈壘鍒拌鑺傜洰");
-// }
-// ProgramPro programPro = new ProgramPro();
-// try {
-// programPro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
-// programPro.setProgramId(pid);
-// programPro.setScreenShot(byId.getScreenShot());
-// programPro.getLayers().forEach(
-// layerPro -> {
-// layerPro.getSources().forEach(
-// sourcePro -> {
-// long fileId = Long.parseLong(sourcePro.getId());
-// file.add(xiXunFileService.getById(fileId));
-// }
-// );
-// }
-// );
-// programPro.setFileList(file);
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// return programPro;
-// }
-
-
/**
* 鎺ㄩ�佽妭鐩�
*
@@ -214,10 +196,10 @@
list2.add(items);
taskPro.setItems(list2);
command.setId(UUID.randomUUID().toString());
- //杩欓噷鏄笅鏂圭殑post鍥炶皟鍦板潃锛岄渶瑕佷慨鏀笽P鍦板潃
- command.setNotificationURL("http://" + config.getIp() + ":" + config.getPort() + "/machine-fast/serv/download/getJSON");
+// //杩欓噷鏄笅鏂圭殑post鍥炶皟鍦板潃锛岄渶瑕佷慨鏀笽P鍦板潃
+ command.setNotificationURL("");
//璧勬簮涓嬭浇閾炬帴鐨勮姹傚ご
- command.setPreDownloadURL("http://" + config.getIp() + ":" + config.getPort() + "/machine-fast/serv/download/downliadFileById/");
+ command.setPreDownloadURL("");
command.setTask(taskPro);
xixun.set_id(UUID.randomUUID().toString());
xixun.setCommand(command);
@@ -314,7 +296,7 @@
/**
* 鐔欐睕澶ф皵鏁版嵁鎺ㄩ�佹棩蹇楄褰曞紑濮�
-// */
+ // */
// String content = "{璁惧code锛�" + lightemitControlCode
// + "锛� 鎺ㄩ�佸唴瀹癸細" + body
// + " }";
--
Gitblit v1.9.3