From 2d4afbbcfda71f826ed532d01de860395c4da2b6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 26 五月 2022 14:40:36 +0800
Subject: [PATCH] 角色等级FIX
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 108 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 69 insertions(+), 39 deletions(-)
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 1da12b1..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
@@ -15,6 +15,7 @@
import com.sandu.ximon.admin.utils.JsonUtil;
import com.sandu.ximon.admin.utils.LightemitUtils;
import com.sandu.ximon.admin.utils.LogUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.request.SubTitleSet;
import com.sandu.ximon.dao.domain.LedSFile;
import com.sandu.ximon.dao.domain.Pole;
@@ -68,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());
@@ -75,20 +88,27 @@
poleXixunPlayer.setHeight(programPro.getHeight());
poleXixunPlayer.setWidth(programPro.getWidth());
poleXixunPlayer.setTotalSize((float) programPro.getTotalSize() / 1000000 + "MB");
-// poleXixunPlayer.setTotalSize( Long.parseLong(programPro.getTotalSize()) / 1000000 + "MB");
-// programPro.setProgramId(poleXixunPlayer.getProgramId());
-// System.out.println(poleXixunPlayer.getProgramId());
poleXixunPlayer.setRequestBody(json);
poleXixunPlayer.setScreenShot(programPro.getScreenShot());
- // poleXixunPlayer.setCreatTime(sdf.format(date));
- poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
if (SecurityUtils.getClientId() != null) {
poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
if (clientService.findClientId()) {
poleXixunPlayer.setClientId(clientService.getClientId());
}
}
- return this.save(poleXixunPlayer);
+ boolean save = this.save(poleXixunPlayer);
+ /**
+ * 鐔欐睕鑺傜洰鏂板鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鑺傜洰id锛�" + poleXixunPlayer.getProgramId()
+ + "锛� 鑺傜洰鍚嶇О锛�" + poleXixunPlayer.getProgramName()
+ + "锛� 鑺傜洰鍐呭锛�" + json
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕鑺傜洰鏇存敼", content);
+ /**
+ * 鐔欐睕鑺傜洰鏂板鏃ュ織璁板綍缁撴潫
+ */
+ return save;
}
public boolean deleteProgram(Long pid) {
@@ -96,6 +116,16 @@
if (byId == null) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
+ /**
+ * 鐔欐睕鑺傜洰鍒犻櫎鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鍒犻櫎鐨勮妭鐩甶d锛�" + byId.getProgramId()
+ + "锛� 鍒犻櫎鐨勮妭鐩悕绉帮細" + byId.getProgramName()
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕鑺傜洰鍒犻櫎", content);
+ /**
+ * 鐔欐睕鑺傜洰鍒犻櫎鏃ュ織璁板綍缁撴潫
+ */
return removeById(pid);
}
@@ -128,36 +158,6 @@
}
return programPro;
}
-
-
-// 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;
-// }
/**
@@ -196,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);
@@ -220,6 +220,23 @@
LogUtils.error("缁撴灉:" + post);
}
}
+
+
+ /**
+ * 鐔欐睕鑺傜洰鎺ㄩ�佹棩蹇楄褰曞紑濮�
+ */
+ List<String> listCode = new ArrayList<>();
+ for (PoleLightemitEntity bean : poleLightemitEntities) {
+ listCode.add(bean.getLightemitControlCode());
+ }
+ String content = "{鑺傜洰id锛�" + programId
+ + "锛� 鑺傜洰鍚嶇О锛�" + poleXixunPlayerEntity.getProgramName()
+ + "锛� 鑺傜洰鍐呭锛�" + json
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕鑺傜洰鎺ㄩ��", content);
+ /**
+ * 鐔欐睕鑺傜洰鎺ㄩ�佹棩蹇楄褰曠粨鏉�
+ */
}
@@ -276,6 +293,19 @@
lightemitUtils.clearPlayerTask(lightemitControlCode);
//鎺ㄩ�佹渶鍚庡懡浠�
lightemitUtils.sendLastCommand(lightemitControlCode);
+
+ /**
+ * 鐔欐睕澶ф皵鏁版嵁鎺ㄩ�佹棩蹇楄褰曞紑濮�
+ // */
+// String content = "{璁惧code锛�" + lightemitControlCode
+// + "锛� 鎺ㄩ�佸唴瀹癸細" + body
+// + " }";
+// List<String> listCode = new ArrayList<>();
+// listCode.add(lightemitControlCode);
+// StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕澶ф皵鏁版嵁鎺ㄩ��", content);
+ /**
+ * 鐔欐睕澶ф皵鏁版嵁鎺ㄩ�佹棩蹇楄褰曠粨鏉�
+ */
}
}, 60 * 1000);
}
--
Gitblit v1.9.3