From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightPoleHeelingController.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 0f34915..ca4b4f0 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
@@ -6,8 +6,10 @@
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.security.PermissionConfig;
import com.sandu.ximon.admin.service.LightPoleHeelingService;
import com.sandu.ximon.dao.domain.LightPoleHeeling;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -22,6 +24,7 @@
@RequestMapping("/v1/admin/LightPoleHeeling")
public class LightPoleHeelingController {
private final LightPoleHeelingService lightPoleHeelingService;
+ private PermissionConfig permissionConfig;
/**
* 妯＄硦鏌ヨ
@@ -31,6 +34,9 @@
@PostMapping("/listLightPoleHeelingByKeyword")
public ResponseVO<Object> listLightPoleHeelingByKeyword(BaseConditionVO baseConditionVO
, @RequestBody(required = false) LightPoleHeelingListParam lightPoleHeelingListParam) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_POLE_HEELING_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<LightPoleHeeling> list = lightPoleHeelingService.listLightPoleHeelingByKeyword(baseConditionVO, lightPoleHeelingListParam);
return ResponseUtil.successPage(list);
}
@@ -64,11 +70,13 @@
*/
@PostMapping("/RestartLightPoleHeeling")
public ResponseVO<Object> RestartLightPoleHeeling(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
- if ("鎿嶄綔鎴愬姛".equals(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()))) {
- return ResponseUtil.success(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()));
+ String result = lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName());
+ if ("鎿嶄綔鎴愬姛".equals(result)) {
+ return ResponseUtil.success(result);
} else {
- return ResponseUtil.fail(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()));
+ return ResponseUtil.fail(result);
}
+
}
/**
@@ -76,11 +84,13 @@
*/
@PostMapping("/SetHeartbeatPacketTime")
public ResponseVO<Object> SetHeartbeatPacketTime(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
- if ("鎿嶄綔鎴愬姛".equals(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()))) {
- return ResponseUtil.success(lightPoleHeelingService.SetHeartbeatPacketTime(lightPoleHeelingParam.getDeviceName(), lightPoleHeelingParam.getTime()));
+ String result = lightPoleHeelingService.SetHeartbeatPacketTime(lightPoleHeelingParam.getDeviceName(), lightPoleHeelingParam.getTime());
+ if ("鎿嶄綔鎴愬姛".equals(result)) {
+ return ResponseUtil.success(result);
} else {
- return ResponseUtil.fail(lightPoleHeelingService.SetHeartbeatPacketTime(lightPoleHeelingParam.getDeviceName(), lightPoleHeelingParam.getTime()));
+ return ResponseUtil.fail(result);
}
+
}
/**
@@ -88,11 +98,11 @@
*/
@PostMapping("/SetSensorState")
public ResponseVO<Object> SetSensorState(@RequestBody @Validated LightPoleHeelingParam lightPoleHeelingParam) {
- if ("鎿嶄綔鎴愬姛".equals(lightPoleHeelingService.RestartLightPoleHeeling(lightPoleHeelingParam.getDeviceName()))) {
- return ResponseUtil.success(lightPoleHeelingService.SetSensorState(lightPoleHeelingParam.getDeviceName()));
+ String result = lightPoleHeelingService.SetSensorState(lightPoleHeelingParam.getDeviceName());
+ if ("鎿嶄綔鎴愬姛".equals(result)) {
+ return ResponseUtil.success(result);
} else {
- return ResponseUtil.fail(lightPoleHeelingService.SetSensorState(lightPoleHeelingParam.getDeviceName()));
+ return ResponseUtil.fail(result);
}
-
}
}
--
Gitblit v1.9.3