From 9f4c4e77bd7936645d174f21a6abf8951b533e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 17:51:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampPostController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 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 bea88ae..c8bb945 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,12 @@
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.sandu.common.domain.ResponseVO;
-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,27 +14,36 @@
import java.util.List;
+/**
+ * 鐏潌妯″潡浠ュ強璁剧疆鍒嗙粍鍒板搴旂伅鏉� 寮冪敤
+ */
@RestController
@AllArgsConstructor
@RequestMapping("/v1/LampPost")
public class LampPostController {
- private final LampPostService lampPostService;
+ private final LampPostService poleService;
@GetMapping("/add")
public ResponseVO<Object> addLampPost(@RequestBody LampPostParam lampPostParam){
- return ResponseUtil.success( lampPostService.addLamp(lampPostParam));
+ return ResponseUtil.success( poleService.addLamp(lampPostParam));
}
@GetMapping("/update/{id}")
public ResponseVO<Object> updateLampPost(@PathVariable Long id, @RequestBody LampPostParam lampPostParam){
- return ResponseUtil.success( lampPostService.updateLamp(id,lampPostParam));
+ return ResponseUtil.success( poleService.updateLamp(id,lampPostParam));
}
+
+ @GetMapping("/delete/{id}")
+ public ResponseVO<Object> deleteLampPost(@PathVariable Long id){
+ return ResponseUtil.success(poleService.deleteLampPost(id));
+ }
+
@PostMapping("/setGroup")
public ResponseVO<Object> setGroup(@RequestBody GroupParam groupParam){
- lampPostService.setGroup(groupParam.getGroup(), groupParam.getId());
+ poleService.setGroup(groupParam.getGroup(), groupParam.getId());
return ResponseUtil.success("鍒嗙粍璁剧疆鎴愬姛");
}
@@ -45,9 +55,36 @@
//return ResponseUtil.success(lampPostService.listLamp());
}*/
+ /**
+ * 鏌ヨ鐏潌鍒楄〃骞舵惡甯﹀湪绾跨姸鎬�
+ * @return
+ */
@PostMapping("/list")
public ResponseVO<Object> listLamp(){
- return ResponseUtil.success(lampPostService.queryStates());
+ return ResponseUtil.success(poleService.queryStates());
+ }
+
+ /**
+ * 鎭㈠鍑哄巶璁剧疆
+ * @param id
+ * @return
+ */
+ @GetMapping("/lightReset/{id}")
+ public ResponseVO<Object> LightReset(@PathVariable Long id){
+ return ResponseUtil.success(poleService.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> list= poleService.list(wrapper);
+ return ResponseUtil.success(list);
}
}
--
Gitblit v1.9.3