From 8c46bedb1a637ba04bd406dab7bba889e1d5d658 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期六, 07 五月 2022 18:30:22 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
index eba60c3..1964f00 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
@@ -7,8 +7,10 @@
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.LEDProgramParam;
import com.sandu.ximon.admin.param.ReceiveParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LEDProgramService;
import com.sandu.ximon.dao.domain.LEDProgram;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -21,6 +23,7 @@
@RequestMapping("/v1/LEDProgram")
public class LEDProgramController {
private final LEDProgramService ledProgramService;
+ private PermissionConfig permissionConfig;
@PostMapping("/add")
public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
@@ -29,8 +32,14 @@
@PostMapping("/update/{pid}")
public ResponseVO<Object> updateLEDProgram(@PathVariable Long pid, @RequestBody @Validated LEDProgramParam ledProgramParam) {
- return ResponseUtil.success(ledProgramService.updateProgram(pid,ledProgramParam));
+ return ResponseUtil.success(ledProgramService.updateProgram(pid, ledProgramParam));
}
+
+ @GetMapping("/getbypid/{pid}")
+ public ResponseVO<Object> getByPid(@PathVariable Long pid) {
+ return ResponseUtil.success(ledProgramService.getByPid(pid));
+ }
+
@PostMapping("/delete/{pid}")
public ResponseVO<Object> deleteLEDProgram(@PathVariable Long pid) {
@@ -40,37 +49,40 @@
@GetMapping("/list")
public ResponseVO<Object> listProgram(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.LED_PROGRAM_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
- if(null!=keyword){
- wrapper.like(LEDProgram::getName,keyword);
+ if (keyword != null && !keyword.isEmpty()) {
+ wrapper.like(LEDProgram::getName, keyword);
}
return ResponseUtil.successPage(ledProgramService.list(wrapper));
}
- /**
- * 妯＄硦鏌ヨ
- *
- * @return
- */
- @GetMapping("/listLike")
- public ResponseVO<Object> listLikeProgram(@RequestBody ReceiveParam receiveParam) {
- LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
- if (receiveParam.getKind() != null || receiveParam.getName() != null) {
-
- wrapper.like(LEDProgram::getName, receiveParam.getName())
- .or(
- ledProgramLambdaQueryWrapper -> {
- ledProgramLambdaQueryWrapper.like(LEDProgram::getKind, receiveParam.getKind());
- }
- );
-
- }
-
- // List<LEDProgram> list = ledProgramService.list(wrapper);
- return ResponseUtil.success(ledProgramService.list(wrapper));
-
- }
+// /**
+// * 妯＄硦鏌ヨ
+// *
+// * @return
+// */
+// @GetMapping("/listLike")
+// public ResponseVO<Object> listLikeProgram(@RequestBody ReceiveParam receiveParam) {
+// LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
+// if (receiveParam.getKind() != null || receiveParam.getName() != null) {
+//
+// wrapper.like(LEDProgram::getName, receiveParam.getName())
+// .or(
+// ledProgramLambdaQueryWrapper -> {
+// ledProgramLambdaQueryWrapper.like(LEDProgram::getKind, receiveParam.getKind());
+// }
+// );
+//
+// }
+//
+// // List<LEDProgram> list = ledProgramService.list(wrapper);
+// return ResponseUtil.success(ledProgramService.list(wrapper));
+//
+// }
}
--
Gitblit v1.9.3