From b2cf36ae92e61534f9d2e02068bff0f5127272bc Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 14:13:44 +0800
Subject: [PATCH] 接口排序
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java | 47 ++++++++++++++++++++++++++++++-----------------
1 files changed, 30 insertions(+), 17 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 a03e5d8..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;
@@ -18,14 +20,15 @@
@AllArgsConstructor
public class LEDProgramService extends BaseServiceImpl<LEDProgramMapper, LEDProgram> {
-
+ private final ClientService clientService;
public boolean addProgram(LEDProgramParam receiveParam) {
LEDProgram led = new LEDProgram();
- led.setUserId(SecurityUtils.getClientId());
- if (SecurityUtils.getClientId() != null) {
- led.setUserName(SecurityUtils.getUsername());
+ led.setUserId(SecurityUtils.getUserId());
+ led.setUserName(SecurityUtils.getUsername());
+ if (clientService.findClientId()) {
+ led.setClientId(clientService.getClientId());
}
led.setName(receiveParam.getName());
led.setPreview(receiveParam.getPreviewUrl());
@@ -36,16 +39,13 @@
}
- public boolean updateProgram(Long pid,LEDProgramParam receiveParam) {
+ public boolean updateProgram(Long pid, LEDProgramParam receiveParam) {
- LEDProgram byId = getById(pid);
- if (byId == null) {
+ LEDProgram led = getById(pid);
+ if (led == null) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
- LEDProgram led = new LEDProgram();
- led.setId(pid);
- //led.setUserId(SecurityUtils.getClientId());
led.setName(receiveParam.getName());
led.setPreview(receiveParam.getPreviewUrl());
led.setWidth(receiveParam.getWidth());
@@ -70,7 +70,7 @@
if (byId == null) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
- LEDProgramParam param=new LEDProgramParam();
+ LEDProgramParam param = new LEDProgramParam();
param.setId(byId.getId());
param.setHeight(byId.getHeight());
param.setWidth(byId.getWidth());
@@ -80,13 +80,26 @@
return param;
}
-
- public LambdaQueryWrapper<LEDProgram> listProgram() {
- if (SecurityUtils.getClientId() != null) {
- return Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId, SecurityUtils.getClientId());
- } else {
- return Wrappers.lambdaQuery(LEDProgram.class);
+ 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> listPrograms() {
+ if (SecurityUtils.getClientId() == null) {
+ return Wrappers.lambdaQuery(LEDProgram.class);
+ } else {
+ return Wrappers.lambdaQuery(LEDProgram.class).eq(LEDProgram::getUserId, SecurityUtils.getUserId())
+ .or(w -> {
+ w.eq(LEDProgram::getClientId, SecurityUtils.getClientId());
+ });
+ }
+ }
}
--
Gitblit v1.9.3