From a6c1883ee4ab4bff218709eabe6aa786a1c3e715 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 15:59:53 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 30 ++++++------------------------
1 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
index 5ac63ce..f2be0f2 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java
@@ -2,7 +2,6 @@
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.manager.iot.amqp.processor.AirDataProcessor;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
@@ -12,6 +11,7 @@
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.AirDataService;
+import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
@@ -31,6 +31,7 @@
public class AirDataController {
private final AirDataService airDataService;
private PermissionConfig permissionConfig;
+ private RedisUtils redisUtils;
/**
* 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
@@ -47,31 +48,11 @@
return ResponseUtil.successPage(list);
}
- /**
- * 鏌ヨ澶ф皵璁惧MAC鍦板潃
- *
- * @return
- */
- @GetMapping("/listAirEquipmentMAC")
- public ResponseVO<Object> listAirEquipmentMAC() {
- //TODO
- List<String> list = airDataService.listAirEquipmentMAC();
- return ResponseUtil.success(list);
- }
-
- /**
- * 鏍规嵁鐏潌鏌ヨ澶ф皵鏁版嵁
- * @param
- * @return
- */
- @AnonymousAccess
- @GetMapping("/listAirDataByLamp")
- public ResponseVO<Object> listAirDataByLamp(@RequestParam Long lampId) {
- return ResponseUtil.success(airDataService.getDataByPoleid(lampId));
- }
-
@PostMapping("/updateAirEquipmentInfo")
public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
+ if (!permissionConfig.check(MenuEnum.AIR_DATA_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
AirDataReqInnerFrame airDataReqInnerFrame = new AirDataReqInnerFrame();
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), airDataReqInnerFrame);
System.out.println(a5Frame + " --------a5Frame");
@@ -85,6 +66,7 @@
System.out.println(commonFrame + " -----------commonFrame");
AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame);
if (commonFrame != null) {
+
success.add(macStr);
} else {
failed.add(macStr);
--
Gitblit v1.9.3