From 35b68d05c92ae1eab2e409529a070a217ba492ae Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 25 四月 2022 09:53:23 +0800
Subject: [PATCH] fix 客户列表bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 95 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 16 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 856ea90..a21f1b9 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,7 +1,8 @@
package com.sandu.ximon.admin.service;
-import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.sandu.common.execption.BusinessException;
@@ -13,6 +14,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.LEDProgram;
import com.sandu.ximon.dao.domain.LedSFile;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
@@ -20,7 +22,10 @@
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;
/**
* 鐔欒鑺傜洰
@@ -37,6 +42,29 @@
private final ClientService clientService;
private final LedSFileService xiXunFileService;
+ //鐔欒鑺傜洰鍒楄〃
+ public LambdaQueryWrapper<PoleXixunPlayerEntity> XixunPlayerList(String keyword) {
+ if (SecurityUtils.getClientId() == null) {
+ if (keyword != null && keyword.isEmpty()) {
+ return Wrappers.lambdaQuery(PoleXixunPlayerEntity.class);
+ } else {
+ return Wrappers.lambdaQuery(PoleXixunPlayerEntity.class).like(PoleXixunPlayerEntity::getProgramName, keyword);
+ }
+
+ } else {
+ if (keyword != null && keyword.isEmpty()) {
+ return Wrappers.lambdaQuery(PoleXixunPlayerEntity.class).eq(PoleXixunPlayerEntity::getCreateUserId, SecurityUtils.getUserId())
+ .or(w -> {
+ w.eq(PoleXixunPlayerEntity::getClientId, SecurityUtils.getClientId());
+ });
+ } else {
+ return Wrappers.lambdaQuery(PoleXixunPlayerEntity.class).eq(PoleXixunPlayerEntity::getCreateUserId, SecurityUtils.getUserId())
+ .or(w -> {
+ w.eq(PoleXixunPlayerEntity::getClientId, SecurityUtils.getClientId());
+ }).like(PoleXixunPlayerEntity::getProgramName, keyword);
+ }
+ }
+ }
public boolean insert(ProgramPro programPro) {
String json = JsonUtil.jsonObj2Sting(programPro);
@@ -46,17 +74,19 @@
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(!clientService.findClientId()){
- poleXixunPlayer.setClientId(clientService.getClientId());
+ if (SecurityUtils.getClientId() != null) {
+ poleXixunPlayer.setCreateUserId(SecurityUtils.getUserId());
+ if (clientService.findClientId()) {
+ poleXixunPlayer.setClientId(clientService.getClientId());
+ }
}
-
-
return this.save(poleXixunPlayer);
}
@@ -70,8 +100,8 @@
public Object getByPid(Long pid) {
PoleXixunPlayerEntity byId = getById(pid);
- List<Long> fileIds=new ArrayList<>();
- List<LedSFile> file=new ArrayList<>();
+ List<Long> fileIds = new ArrayList<>();
+ List<LedSFile> file = new ArrayList<>();
if (byId == null) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
@@ -84,10 +114,10 @@
programPro.getLayers().forEach(
layerPro -> {
layerPro.getSources().forEach(
- sourcePro -> {
- long fileId = Long.parseLong(sourcePro.getId());
- file.add(xiXunFileService.getById(fileId));
- }
+ sourcePro -> {
+ long fileId = Long.parseLong(sourcePro.getId());
+ file.add(xiXunFileService.getById(fileId));
+ }
);
}
);
@@ -95,11 +125,44 @@
} catch (Exception e) {
e.printStackTrace();
}
- return programPro;
+ 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;
+// }
+
/**
* 鎺ㄩ�佽妭鐩�
+ *
* @param programId
* @param lightemitIds
*/
@@ -149,12 +212,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