From 31e798604209979bb9e93652dc0b0ac8d4d61538 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 17 五月 2022 17:54:16 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java | 40 +++++++++++++---------------------------
1 files changed, 13 insertions(+), 27 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 39d1d3e..cc8f0ff 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
@@ -6,7 +6,6 @@
import com.sandu.common.object.BaseConditionVO;
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;
@@ -27,22 +26,34 @@
@PostMapping("/add")
public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
+ if (!permissionConfig.check(MenuEnum.LED_N_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramService.addProgram(ledProgramParam));
}
@PostMapping("/update/{pid}")
public ResponseVO<Object> updateLEDProgram(@PathVariable Long pid, @RequestBody @Validated LEDProgramParam ledProgramParam) {
+ if (!permissionConfig.check(MenuEnum.LED_N_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramService.updateProgram(pid, ledProgramParam));
}
@GetMapping("/getbypid/{pid}")
public ResponseVO<Object> getByPid(@PathVariable Long pid) {
+ if (!permissionConfig.check(MenuEnum.LED_N_DETAIL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramService.getByPid(pid));
}
@PostMapping("/delete/{pid}")
public ResponseVO<Object> deleteLEDProgram(@PathVariable Long pid) {
+ if (!permissionConfig.check(MenuEnum.LED_N_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(ledProgramService.deleteProgram(pid));
}
@@ -54,35 +65,10 @@
}
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
LambdaQueryWrapper<LEDProgram> wrapper = ledProgramService.listProgram();
- if (!keyword.isEmpty()) {
+ 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));
-//
-// }
-
}
--
Gitblit v1.9.3