From abef71a4699135dd5007d0e6fcc610dac0370ff3 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 24 三月 2022 17:01:48 +0800
Subject: [PATCH] 灯杆倾斜
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java
index ec6f3a6..2aee379 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java
@@ -1,8 +1,10 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.C3ChargingParam;
+import com.sandu.ximon.admin.param.LightPoleHeelingListParam;
import com.sandu.ximon.admin.param.LightPoleHeelingParam;
import com.sandu.ximon.admin.service.LightPoleHeelingService;
import com.sandu.ximon.dao.domain.LightPoleHeeling;
@@ -32,9 +34,10 @@
*
* @return
*/
- @GetMapping("/listLightPoleHeelingByKeyword/{keyword}")
- public ResponseVO<Object> listLightPoleHeelingByKeyword(@PathVariable String keyword) {
- List<LightPoleHeeling> list = lightPoleHeelingService.listLightPoleHeelingByKeyword(keyword);
+ @PostMapping("/listLightPoleHeelingByKeyword")
+ public ResponseVO<Object> listLightPoleHeelingByKeyword(BaseConditionVO baseConditionVO
+ , @RequestBody(required = false) LightPoleHeelingListParam lightPoleHeelingListParam) {
+ List<LightPoleHeeling> list = lightPoleHeelingService.listLightPoleHeelingByKeyword(baseConditionVO, lightPoleHeelingListParam);
return ResponseUtil.successPage(list);
}
@@ -67,8 +70,11 @@
*/
@PostMapping("/RestartLightPoleHeeling")
public ResponseVO<Object> RestartLightPoleHeeling(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
- return ResponseUtil.success(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()));
-
+ if ("鎿嶄綔鎴愬姛".equals(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()))) {
+ return ResponseUtil.success(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()));
+ } else {
+ return ResponseUtil.fail(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()));
+ }
}
/**
@@ -76,8 +82,11 @@
*/
@PostMapping("/SetHeartbeatPacketTime")
public ResponseVO<Object> SetHeartbeatPacketTime(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
-
- return ResponseUtil.success(lightPoleHeelingService.SetHeartbeatPacketTime(lightPoleHeelingParam.getDeviceName(), lightPoleHeelingParam.getTime()));
+ if ("鎿嶄綔鎴愬姛".equals(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()))) {
+ return ResponseUtil.success(lightPoleHeelingService.SetHeartbeatPacketTime(lightPoleHeelingParam.getDeviceName(), lightPoleHeelingParam.getTime()));
+ } else {
+ return ResponseUtil.fail(lightPoleHeelingService.SetHeartbeatPacketTime(lightPoleHeelingParam.getDeviceName(), lightPoleHeelingParam.getTime()));
+ }
}
/**
@@ -85,7 +94,11 @@
*/
@PostMapping("/SetSensorState")
public ResponseVO<Object> SetSensorState(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
+ if ("鎿嶄綔鎴愬姛".equals(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()))) {
+ return ResponseUtil.success(lightPoleHeelingService.SetSensorState(lightPoleHeelingParam.getDeviceName()));
+ } else {
+ return ResponseUtil.fail(lightPoleHeelingService.SetSensorState(lightPoleHeelingParam.getDeviceName()));
+ }
- return ResponseUtil.success(lightPoleHeelingService.SetSensorState(lightPoleHeelingParam.getDeviceName()));
}
}
--
Gitblit v1.9.3