From 5a1051133df369c83aa2987311e15ddbde30ba08 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 01 四月 2022 14:04:08 +0800
Subject: [PATCH] C3充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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..cae2ae4 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
@@ -13,6 +13,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.dao.domain.LedSFile;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
import com.sandu.ximon.dao.mapper.PoleXixunPlayerEntityMapper;
@@ -33,6 +34,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 +46,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 +71,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,6 +81,18 @@
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();
}
--
Gitblit v1.9.3