From e99a7c85fa0864e7b326b8d3ae7234d228f5cdb1 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 13 十二月 2021 11:49:14 +0800
Subject: [PATCH] 细节调整
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampPostController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampPostController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampPostController.java
index 6ceb70c..d0051da 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampPostController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampPostController.java
@@ -1,11 +1,16 @@
package com.sandu.ximon.admin.controller;
import cn.hutool.core.util.RadixUtil;
+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.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.GroupParam;
import com.sandu.ximon.admin.param.LampPostParam;
+import com.sandu.ximon.admin.param.ReceiveParam;
import com.sandu.ximon.admin.service.LampPostService;
import com.sandu.ximon.dao.domain.LampPost;
import lombok.AllArgsConstructor;
@@ -13,6 +18,9 @@
import java.util.List;
+/**
+ * 鐏潌妯″潡浠ュ強璁剧疆鍒嗙粍鍒板搴旂伅鏉�
+ */
@RestController
@AllArgsConstructor
@RequestMapping("/v1/LampPost")
@@ -20,15 +28,21 @@
private final LampPostService lampPostService;
- @PostMapping("/add")
+ @GetMapping("/add")
public ResponseVO<Object> addLampPost(@RequestBody LampPostParam lampPostParam){
return ResponseUtil.success( lampPostService.addLamp(lampPostParam));
}
- @PostMapping("/update/{id}")
+ @GetMapping("/update/{id}")
public ResponseVO<Object> updateLampPost(@PathVariable Long id, @RequestBody LampPostParam lampPostParam){
return ResponseUtil.success( lampPostService.updateLamp(id,lampPostParam));
}
+
+ @GetMapping("/delete/{id}")
+ public ResponseVO<Object> deleteLampPost(@PathVariable Long id){
+ return ResponseUtil.success(lampPostService.deleteLampPost(id));
+ }
+
@PostMapping("/setGroup")
@@ -37,12 +51,46 @@
return ResponseUtil.success("鍒嗙粍璁剧疆鎴愬姛");
}
- @AnonymousAccess
- @GetMapping("/list")
- public ResponseVO<Object> listLamp(){
+ // @AnonymousAccess
+ //@PostMapping("/list")
+ /* public ResponseVO<Object> listLamp(){
//List<LampPost> list = lampPostService.list();
return ResponseUtil.success(lampPostService.list());
//return ResponseUtil.success(lampPostService.listLamp());
+ }*/
+
+ /**
+ * 鏌ヨ鐏潌鍒楄〃骞舵惡甯﹀湪绾跨姸鎬�
+ * @return
+ */
+ @PostMapping("/list")
+ public ResponseVO<Object> listLamp(){
+ return ResponseUtil.success(lampPostService.queryStates());
+ }
+
+ /**
+ * 鎭㈠鍑哄巶璁剧疆
+ * @param id
+ * @return
+ */
+ @GetMapping("/lightReset/{id}")
+ public ResponseVO<Object> LightReset(@PathVariable Long id){
+ return ResponseUtil.success(lampPostService.LightReset(id));
+ }
+
+
+
+ @GetMapping("/lsitLike")
+ public ResponseVO<Object> list( @RequestBody ReceiveParam receiveParam){
+ LambdaQueryWrapper<LampPost> wrapper = Wrappers.lambdaQuery(LampPost.class);
+ if(receiveParam.getKeyWord()!=null){
+ wrapper.like(LampPost::getLampId,receiveParam.getKeyWord())
+ .or(lampPostLambdaQueryWrapper -> {
+ lampPostLambdaQueryWrapper.like(LampPost::getName,receiveParam.getKeyWord());
+ });
+ }
+ List<LampPost> lsit=lampPostService.list(wrapper);
+ return ResponseUtil.success(lsit);
}
}
--
Gitblit v1.9.3