From 084da21b87bddb997ab627a4ef1899230a3a293a Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 17:50:11 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
index 3ad5ff3..fa8d1b2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
@@ -1,9 +1,18 @@
package com.sandu.ximon.admin.controller;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.PlayPlanParam;
+import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.PlayPlanNvService;
+import com.sandu.ximon.dao.domain.Client;
+import com.sandu.ximon.dao.domain.PlayPlanNv;
+import com.sandu.ximon.dao.enums.AdministratorEnums;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -38,9 +47,18 @@
public ResponseVO<Object> pushToLed(@PathVariable Long plianId) {
return ResponseUtil.success(playPlanNvService.pushToLed(plianId));
}
- @GetMapping("/listPaln")
- public ResponseVO<Object> list() {
- return ResponseUtil.success(playPlanNvService.list());
+ @GetMapping("/listPlan")
+ public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ LambdaQueryWrapper<PlayPlanNv> wrapper = new LambdaQueryWrapper<>();//
+ if(AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())){
+ wrapper= Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getUserId,SecurityUtils.getUserId());
+ }
+ wrapper=Wrappers.lambdaQuery(PlayPlanNv.class);
+ if(StrUtil.isNotBlank(keyword)){
+ wrapper.like(PlayPlanNv::getName,keyword);
+ }
+ return ResponseUtil.successPage(playPlanNvService.list(wrapper));
}
}
--
Gitblit v1.9.3