From b34d941094d11e21e21a2ceead8a9fdeee640e2d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 27 五月 2022 11:20:55 +0800
Subject: [PATCH] 列表
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
index 595bc8f..7fab106 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
@@ -3,7 +3,9 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.LEDProgramParam;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -12,7 +14,6 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
import java.util.List;
@Service
@@ -24,13 +25,11 @@
public boolean addProgram(LEDProgramParam receiveParam) {
LEDProgram led = new LEDProgram();
-// if (SecurityUtils.getClientId() != null) {
- led.setUserId(SecurityUtils.getUserId());
- led.setUserName(SecurityUtils.getUsername());
- if (clientService.findClientId()) {
- led.setClientId(clientService.getClientId());
- }
-// }
+ led.setUserId(SecurityUtils.getUserId());
+ led.setUserName(SecurityUtils.getUsername());
+ if (clientService.findClientId()) {
+ led.setClientId(clientService.getClientId());
+ }
led.setName(receiveParam.getName());
led.setPreview(receiveParam.getPreviewUrl());
led.setWidth(receiveParam.getWidth());
@@ -81,8 +80,19 @@
return param;
}
+ public List<LEDProgram> listProgram(BaseConditionVO baseConditionVO, String keyword) {
+ LambdaQueryWrapper<LEDProgram> wrapper = listPrograms();
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ }
+ if (keyword != null && !keyword.isEmpty()) {
+ wrapper.like(LEDProgram::getName, keyword);
+ }
+ return list(wrapper);
+ }
- public LambdaQueryWrapper<LEDProgram> listProgram() {
+
+ public LambdaQueryWrapper<LEDProgram> listPrograms() {
if (SecurityUtils.getClientId() == null) {
return Wrappers.lambdaQuery(LEDProgram.class);
} else {
--
Gitblit v1.9.3