From f2dfd5e6fbbb9c4e96e91c86be0bb6f7a44d87c3 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 18 四月 2022 11:56:21 +0800
Subject: [PATCH] LED屏列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 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 9ec7c6f..6adbc76 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
@@ -1,6 +1,5 @@
package com.sandu.ximon.admin.service;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -13,13 +12,17 @@
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.dao.domain.LedSFile;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
import com.sandu.ximon.dao.mapper.PoleXixunPlayerEntityMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
/**
* 鐔欒鑺傜洰
@@ -33,6 +36,8 @@
private final LightemitUtils lightemitUtils;
private final RealtimeServerBean realtimeServerBean;
private final PoleLightemitService poleLightemitService;
+ private final ClientService clientService;
+ private final LedSFileService xiXunFileService;
public boolean insert(ProgramPro programPro) {
@@ -43,11 +48,17 @@
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.getClientId());
+ poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
+ if (!clientService.findClientId()) {
+ poleXixunPlayer.setClientId(clientService.getClientId());
+ }
+
return this.save(poleXixunPlayer);
}
@@ -62,6 +73,8 @@
public Object getByPid(Long pid) {
PoleXixunPlayerEntity byId = getById(pid);
+ List<Long> fileIds = new ArrayList<>();
+ List<LedSFile> file = new ArrayList<>();
if (byId == null) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
@@ -70,14 +83,27 @@
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;
+ return programPro;
}
/**
* 鎺ㄩ�佽妭鐩�
+ *
* @param programId
* @param lightemitIds
*/
@@ -127,12 +153,12 @@
Collection<PoleLightemitEntity> poleLightemitEntities = poleLightemitService.listByIds(lightemitIds);
- if(poleLightemitEntities != null){
- for (PoleLightemitEntity entity: poleLightemitEntities) {
+ if (poleLightemitEntities != null) {
+ for (PoleLightemitEntity entity : poleLightemitEntities) {
lightemitUtils.clear(entity.getLightemitControlCode());
poleLightemitService.updateRequestBody(entity.getLightemitControlCode(), jsondata);
String post = lightemitUtils.post(realtimeServerBean.getCommand() + entity.getLightemitControlCode(), jsondata);
- LogUtils.error("缁撴灉:"+post);
+ LogUtils.error("缁撴灉:" + post);
}
}
}
--
Gitblit v1.9.3