From bc359054c1330f486de6535fecb4b1325081d19a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 09 六月 2022 09:40:46 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 insertions(+), 2 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 ee80711..86f0aa9 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,16 +3,18 @@
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;
import com.sandu.ximon.dao.domain.LEDProgram;
+import com.sandu.ximon.dao.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.LEDProgramMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
import java.util.List;
@Service
@@ -79,8 +81,57 @@
return param;
}
+ public List<LEDProgram> listProgram(BaseConditionVO baseConditionVO, Integer order, Integer seq, String keyword) {
+ LambdaQueryWrapper<LEDProgram> wrapper = listPrograms();
- public LambdaQueryWrapper<LEDProgram> listProgram() {
+ if (keyword != null && !keyword.isEmpty()) {
+ wrapper.like(LEDProgram::getName, keyword);
+ }
+ //鎺掑簭瀛楁
+ String orderByResult = "id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = OrderByEnums.ASC.getCode();
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.LED_N_PROGRAM_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = " ASC";
+ break;
+ case 2:
+ orderBySeq = " DESC";
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ }
+ return list(wrapper);
+ }
+
+ public List<LEDProgram> listProgramOnBinding(String keyword) {
+ LambdaQueryWrapper<LEDProgram> wrapper = listPrograms();
+
+ 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 {
--
Gitblit v1.9.3