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 | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 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 6adbc76..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,6 +1,8 @@
package com.sandu.ximon.admin.service;
+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;
@@ -12,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;
@@ -39,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);
@@ -55,11 +81,12 @@
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);
}
@@ -101,6 +128,38 @@
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;
+// }
+
+
/**
* 鎺ㄩ�佽妭鐩�
*
--
Gitblit v1.9.3