From 4db02ec887a1f4322d08d9f4b9a5e7ad12f3cce7 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 26 四月 2022 16:41:20 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java | 75 +++++++++++++++++++++++++++++--------
1 files changed, 59 insertions(+), 16 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 29df733..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
@@ -1,45 +1,88 @@
package com.sandu.ximon.admin.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
-import com.sandu.common.security.annotation.AnonymousAccess;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.param.GroupParam;
import com.sandu.ximon.admin.param.LEDProgramParam;
-import com.sandu.ximon.admin.param.LampPostParam;
+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.*;
/**
- * led鑺傜洰
+ * LED鑺傜洰澶勭悊
*/
@RestController
@AllArgsConstructor
@RequestMapping("/v1/LEDProgram")
public class LEDProgramController {
private final LEDProgramService ledProgramService;
+ private PermissionConfig permissionConfig;
- @GetMapping("/add")
- public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
+ @PostMapping("/add")
+ public ResponseVO<Object> addLEDProgram(@RequestBody @Validated LEDProgramParam ledProgramParam) {
return ResponseUtil.success(ledProgramService.addProgram(ledProgramParam));
}
- @GetMapping("/update")
- public ResponseVO<Object> updateLEDProgram( @RequestBody @Validated LEDProgramParam ledProgramParam) {
- return ResponseUtil.success(ledProgramService.updateProgram(ledProgramParam));
+ @PostMapping("/update/{pid}")
+ public ResponseVO<Object> updateLEDProgram(@PathVariable Long pid, @RequestBody @Validated LEDProgramParam ledProgramParam) {
+ return ResponseUtil.success(ledProgramService.updateProgram(pid, ledProgramParam));
}
- @GetMapping("/delete/{id}")
- public ResponseVO<Object> deleteLEDProgram(@PathVariable Long id) {
- return ResponseUtil.success(ledProgramService.deleteProgram(id));
+ @GetMapping("/getbypid/{pid}")
+ public ResponseVO<Object> getByPid(@PathVariable Long pid) {
+ return ResponseUtil.success(ledProgramService.getByPid(pid));
}
-
- @PostMapping("/list")
- public ResponseVO<Object> listProgram() {
- return ResponseUtil.success(ledProgramService.list());
+ @PostMapping("/delete/{pid}")
+ public ResponseVO<Object> deleteLEDProgram(@PathVariable Long pid) {
+ return ResponseUtil.success(ledProgramService.deleteProgram(pid));
}
+
+ @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 (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