From 34cc9fb821d30b64947c8a62d952f1621a515149 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 21 三月 2022 10:32:51 +0800
Subject: [PATCH] 普通用户修改密码
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 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 53df1ad..12336bf 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,5 +1,6 @@
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;
@@ -20,6 +21,9 @@
import java.util.*;
+/**
+ * 鐔欒鑺傜洰
+ */
@Service
@AllArgsConstructor
public class XiXunPlayerService extends BaseServiceImpl<PoleXixunPlayerEntityMapper, PoleXixunPlayerEntity> {
@@ -29,17 +33,10 @@
private final LightemitUtils lightemitUtils;
private final RealtimeServerBean realtimeServerBean;
private final PoleLightemitService poleLightemitService;
+ private final ClientService clientService;
public boolean insert(ProgramPro programPro) {
- // SimpleDateFormat sdf=new SimpleDateFormat("yy-MM-dd HH:mm:ss");
- // Date date = new Date();
-// Program program = new Program();
-// try {
-// program = JsonUtil.convertJsonStringToObject(json,Program.class);
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
String json = JsonUtil.jsonObj2Sting(programPro);
PoleXixunPlayerEntity poleXixunPlayer = new PoleXixunPlayerEntity();
poleXixunPlayer.setProgramCode(programPro.get_id());
@@ -47,9 +44,16 @@
poleXixunPlayer.setHeight(programPro.getHeight());
poleXixunPlayer.setWidth(programPro.getWidth());
poleXixunPlayer.setTotalSize((float) 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);
}
@@ -71,12 +75,19 @@
ProgramPro programPro = new ProgramPro();
try {
programPro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
+ programPro.setProgramId(pid);
+ programPro.setScreenShot(byId.getScreenShot());
} catch (Exception e) {
e.printStackTrace();
}
return programPro;
}
+ /**
+ * 鎺ㄩ�佽妭鐩�
+ * @param programId
+ * @param lightemitIds
+ */
public void videoXixunPlayer(long programId, List<Long> lightemitIds) {
ProgramPro pro = new ProgramPro();
@@ -90,6 +101,9 @@
queryWrapper.eq("program_id", programId);
poleXixunPlayerEntity = this.getOne(queryWrapper);
String json = poleXixunPlayerEntity.getRequestBody();
+
+// System.out.println( JSON.parseArray(json, ProgramPro.class));
+
try {
pro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
} catch (Exception e) {
--
Gitblit v1.9.3