From 09a61ca5857ecaa6918f2e0c942e2f0f1f4aa830 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 28 二月 2022 16:06:53 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 156 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 96 insertions(+), 60 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index fc0776e..172a6be 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -1,21 +1,31 @@
package com.sandu.ximon.admin.controller;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
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.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 com.sandu.ximon.admin.dto.DeviceStatus;
+import com.sandu.ximon.admin.param.PoleBindParam;
+import com.sandu.ximon.admin.param.PoleBindingParam;
+import com.sandu.ximon.admin.param.PoleParam;
+import com.sandu.ximon.admin.service.PoleService;
+import com.sandu.ximon.dao.domain.Pole;
import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.Arrays;
import java.util.List;
+import java.util.Map;
/**
* 鐏潌妯″潡浠ュ強璁剧疆鍒嗙粍鍒板搴旂伅鏉�
+ *
* @author chenjiantian
*/
@RestController
@@ -23,71 +33,97 @@
@RequestMapping("/v1/pole")
public class PoleController {
- private final LampPostService poleService;
+ private final PoleService poleService;
- @GetMapping("/add")
- public ResponseVO<Object> addLampPost(@RequestBody LampPostParam lampPostParam){
- return ResponseUtil.success( poleService.addLamp(lampPostParam));
+ @PostMapping("/add")
+ public ResponseVO<Object> addPole(@RequestBody @Validated PoleParam param) {
+ return ResponseUtil.success(poleService.addPole(param));
}
- @GetMapping("/update/{id}")
- public ResponseVO<Object> updateLampPost(@PathVariable Long id, @RequestBody LampPostParam lampPostParam){
- return ResponseUtil.success( poleService.updateLamp(id,lampPostParam));
+ @PostMapping("/update/{poleId}")
+ public ResponseVO<Object> updatePole(@PathVariable Long poleId, @RequestBody @Validated PoleParam param) {
+ return ResponseUtil.success(poleService.updatePole(poleId, param));
}
- @GetMapping("/delete/{id}")
- public ResponseVO<Object> deleteLampPost(@PathVariable Long id){
- return ResponseUtil.success(poleService.deleteLampPost(id));
+ @PostMapping("/delete/{poleId}")
+ public ResponseVO<Object> deletePole(@PathVariable Long poleId) {
+ return ResponseUtil.success(poleService.deletePole(poleId));
}
-
-
- @PostMapping("/setGroup")
- public ResponseVO<Object> setGroup(@RequestBody GroupParam groupParam){
- poleService.setGroup(groupParam.getGroup(), groupParam.getId());
- return ResponseUtil.success("鍒嗙粍璁剧疆鎴愬姛");
- }
-
- // @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(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())
+ @GetMapping("/list")
+ public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ LambdaQueryWrapper<Pole> wrapper = Wrappers.lambdaQuery(Pole.class).orderByDesc(Pole::getId);
+ if (StrUtil.isNotBlank(keyword)) {
+ wrapper.like(Pole::getPoleCode, keyword)
.or(lampPostLambdaQueryWrapper -> {
- lampPostLambdaQueryWrapper.like(LampPost::getName,receiveParam.getKeyWord());
+ lampPostLambdaQueryWrapper.like(Pole::getPoleName, keyword);
});
}
- List<LampPost> lsit= poleService.list(wrapper);
- return ResponseUtil.success(lsit);
+ List<Pole> list = poleService.list(wrapper);
+ return ResponseUtil.successPage(list);
}
+ @GetMapping("/listPoleAndState")
+ public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
+ List<Pole> poles = poleService.queryStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ return ResponseUtil.successPage(poles);
+ }
+
+
+ /**
+ * 璁剧疆涓夊厓鐮�
+ */
+ @PostMapping("/setMac/{baseMac}")
+ public ResponseVO<Object> setMac(@PathVariable String baseMac) {
+ //public ResponseVO<Object> setMac() {
+ return ResponseUtil.success(poleService.setMac(baseMac));
+ // return ResponseUtil.success(poleService.setMac());
+ }
+
+ /**
+ * 鎭㈠鐏潌鍑哄巶璁剧疆
+ */
+ @PostMapping("/poleReset/{poleId}")
+ public ResponseVO<Object> poleReset(@PathVariable Long poleId) {
+ return ResponseUtil.success(poleService.poleReset(poleId));
+ }
+
+
+ /**
+ * 鐏潌缁戝畾璁惧
+ */
+ @PostMapping("/bind/{poleId}")
+ public ResponseVO<Object> bindPole(@PathVariable Long poleId, @RequestBody @Validated PoleBindingParam param) {
+ boolean result = poleService.bindPole(poleId, param);
+ if (result) {
+ return ResponseUtil.success("缁戝畾鎴愬姛");
+ } else {
+ return ResponseUtil.fail("缁戝畾澶辫触");
+ }
+ }
+
+ @PostMapping("/listStatusByDeviceCode")
+ public ResponseVO<Object> getStatusById(@RequestBody String[] deviceCodeList) {
+ for (String s : deviceCodeList) {
+ if (s == null) {
+ return ResponseUtil.fail("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ }
+ if (ArrayUtil.isEmpty(deviceCodeList)) {
+ return ResponseUtil.fail("鍙傛暟涓嶈兘涓虹┖");
+ }
+ List<DeviceStatus> statusList = poleService.listStatusByDeviceCode(CollectionUtil.toList(deviceCodeList));
+ return ResponseUtil.success(statusList);
+ }
+
+ @PostMapping("/ClientBindingPole")
+ public ResponseVO<Object> ClientBindingPole(@RequestBody PoleBindParam param) {
+ return ResponseUtil.success(poleService.ClientBindingPole(param.getClientId(), param.getPoleIds()));//////////////
+ }
+
+
}
--
Gitblit v1.9.3