From c5cfa814841276a39cb93ca77151c68e5784cdd1 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 26 五月 2022 18:22:36 +0800
Subject: [PATCH] 熙讯屏幕列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 107 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 78 insertions(+), 29 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 7b30ecd..86d507b 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
@@ -8,7 +8,6 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.config.RealtimeServerBean;
-import com.sandu.ximon.admin.config.XiXunConfig;
import com.sandu.ximon.admin.entity.*;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -36,8 +35,6 @@
@AllArgsConstructor
public class XiXunPlayerService extends BaseServiceImpl<PoleXixunPlayerEntityMapper, PoleXixunPlayerEntity> {
- private final PoleXixunPlayerEntityMapper poleXixunPlayerEntityMapper;
- private final XiXunConfig config;
private final LightemitUtils lightemitUtils;
private final RealtimeServerBean realtimeServerBean;
private final PoleLightemitService poleLightemitService;
@@ -69,21 +66,8 @@
}
public boolean insert(ProgramPro programPro) {
- programPro.getLayers().forEach(
- layerPro -> {
- layerPro.getSources().forEach(
- sourcePro -> {
- long fileId = Long.parseLong(sourcePro.getId());
- LedSFile file = xiXunFileService.getById(fileId);
- String fileUrl = file.getFileUrl();
- String[] split = fileUrl.split("/");
- sourcePro.setId(split[split.length - 1]);
- sourcePro.setMd5(file.getMd5());
- }
- );
- }
- );
- String json = JsonUtil.jsonObj2Sting(programPro);
+ Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+ String json = gson.toJson(programPro);
PoleXixunPlayerEntity poleXixunPlayer = new PoleXixunPlayerEntity();
poleXixunPlayer.setProgramCode(programPro.get_id());
poleXixunPlayer.setProgramName(programPro.getName());
@@ -106,11 +90,51 @@
+ "锛� 鑺傜洰鍚嶇О锛�" + poleXixunPlayer.getProgramName()
+ "锛� 鑺傜洰鍐呭锛�" + json
+ " }";
- StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕鑺傜洰鏇存敼", content);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕鑺傜洰娣诲姞", content);
/**
* 鐔欐睕鑺傜洰鏂板鏃ュ織璁板綍缁撴潫
*/
return save;
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param programPro
+ * @return
+ */
+ public boolean update(ProgramPro programPro) {
+ Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+ String json = gson.toJson(programPro);
+// String jsondata = JsonUtil.jsonObj2Sting(programPro);
+ PoleXixunPlayerEntity poleXixunPlayer = new PoleXixunPlayerEntity();
+ poleXixunPlayer.setProgramCode(programPro.get_id());
+ poleXixunPlayer.setProgramName(programPro.getName());
+ poleXixunPlayer.setHeight(programPro.getHeight());
+ poleXixunPlayer.setWidth(programPro.getWidth());
+ poleXixunPlayer.setTotalSize((float) programPro.getTotalSize() / 1000000 + "MB");
+ poleXixunPlayer.setRequestBody(json);
+ poleXixunPlayer.setScreenShot(programPro.getScreenShot());
+ if (SecurityUtils.getClientId() != null) {
+ poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
+ if (clientService.findClientId()) {
+ poleXixunPlayer.setClientId(clientService.getClientId());
+ }
+ }
+ poleXixunPlayer.setProgramId(programPro.getProgramId());
+ boolean updateResult = updateById(poleXixunPlayer);
+ /**
+ * 鐔欐睕鑺傜洰鏂板鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鑺傜洰id锛�" + poleXixunPlayer.getProgramId()
+ + "锛� 鑺傜洰鍚嶇О锛�" + poleXixunPlayer.getProgramName()
+ + "锛� 鑺傜洰鍐呭锛�" + json
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕鑺傜洰缂栬緫", content);
+ /**
+ * 鐔欐睕鑺傜洰鏂板鏃ュ織璁板綍缁撴潫
+ */
+ return updateResult;
}
public boolean deleteProgram(Long pid) {
@@ -141,7 +165,9 @@
String json = byId.getRequestBody();
ProgramPro programPro = new ProgramPro();
try {
- programPro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
+ Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+// programPro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
+ programPro=gson.fromJson(json,ProgramPro.class);
programPro.setProgramId(pid);
programPro.setScreenShot(byId.getScreenShot());
programPro.getLayers().forEach(
@@ -172,46 +198,69 @@
//璁板綍鎿嶄綔缁撴灉
List<Map> mapList = new ArrayList<>();
- ProgramPro pro = new ProgramPro();
+
ItemPro items = new ItemPro();
TaskPro taskPro = new TaskPro();
CommandPro command = new CommandPro();
XixunPlayerPro xixun = new XixunPlayerPro();
- PoleXixunPlayerEntity poleXixunPlayerEntity = new PoleXixunPlayerEntity();
+
+ PoleXixunPlayerEntity poleXixunPlayerEntity;
items.set_id(UUID.randomUUID().toString());
QueryWrapper<PoleXixunPlayerEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("program_id", programId);
poleXixunPlayerEntity = this.getOne(queryWrapper);
+ if (poleXixunPlayerEntity == null) {
+ throw new BusinessException("鑺傜洰鏁版嵁寮傚父锛�");
+ }
+
String json = poleXixunPlayerEntity.getRequestBody();
+ if (StringUtils.isEmpty(json)) {
+ throw new BusinessException("鑺傜洰鏁版嵁寮傚父锛�");
+ }
-// System.out.println( JSON.parseArray(json, ProgramPro.class));
-
+ ProgramPro pro;
try {
pro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
+ pro.getLayers().forEach(layerPro -> {
+ layerPro.getSources().forEach(sourcePro -> {
+ long fileId = Long.parseLong(sourcePro.getId());
+ LedSFile file = xiXunFileService.getById(fileId);
+ String fileUrl = file.getFileUrl();
+ String[] split = fileUrl.split("/");
+ sourcePro.setId(split[split.length - 1]);
+ sourcePro.setMd5(file.getMd5());
+ });
+ });
} catch (Exception e) {
e.printStackTrace();
+ throw new BusinessException("鑺傜洰鏁版嵁寮傚父锛�");
}
items.set_program(pro);
items.setRepeatTimes(1);
- items.setSchedulePros(null);//瀹氭椂娈碉紝涓嶅仛瀹氭椂鍙负null
+ //瀹氭椂娈碉紝涓嶅仛瀹氭椂鍙负null
+ items.setSchedulePros(null);
+
taskPro.set_id(UUID.randomUUID().toString());
taskPro.setName(poleXixunPlayerEntity.getProgramName());
+
List<ItemPro> list2 = new ArrayList<>();
list2.add(items);
taskPro.setItems(list2);
+
command.setId(UUID.randomUUID().toString());
-// //杩欓噷鏄笅鏂圭殑post鍥炶皟鍦板潃锛岄渶瑕佷慨鏀笽P鍦板潃
+ //杩欓噷鏄笅鏂圭殑post鍥炶皟鍦板潃锛岄渶瑕佷慨鏀笽P鍦板潃
command.setNotificationURL("");
- //璧勬簮涓嬭浇閾炬帴鐨勮姹傚ご
+ //璧勬簮涓嬭浇閾炬帴鐨勮姹傚ご锛岄樋閲屼簯鍥剧墖涓嬭浇鍦板潃澶�
command.setPreDownloadURL("https://ximonsmart.oss-cn-shanghai.aliyuncs.com/");
command.setTask(taskPro);
+
xixun.set_id(UUID.randomUUID().toString());
xixun.setCommand(command);
- xixun.setType("commandXixunPlayer"); //鍛戒护鍥哄畾绫诲瀷锛屼笉鍙洿鏀�
+ //鍛戒护鍥哄畾绫诲瀷锛屼笉鍙洿鏀�
+ xixun.setType("commandXixunPlayer");
Gson gson = new GsonBuilder().disableHtmlEscaping().create();
-// String jsondata = JSON.toJSONString(xixun);
String jsondata = gson.toJson(xixun);
Collection<PoleLightemitEntity> poleLightemitEntities = poleLightemitService.listByIds(lightemitIds);
--
Gitblit v1.9.3