From 4e91adbb41c89688fe5b0ef03807cfe748a7d59d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 26 五月 2022 17:17:02 +0800
Subject: [PATCH] 角色
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 21 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 98e3b0e..64c24d7 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
@@ -3,20 +3,31 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
-import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
+import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.manager.iot.amqp.processor.AirDataProcessor;
+import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.AirDataReqInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.response.A5LightBrightnessRespInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
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.service.PoleBindingService;
+import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AirDataBo;
+import com.sandu.ximon.dao.domain.Pole;
+import com.sandu.ximon.dao.enums.MenuEnum;
+import com.sandu.ximon.dao.enums.PoleBindingEnums;
+import com.sandu.ximon.dao.mapper.PoleBindingMapper;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 澶ф皵鏁版嵁
@@ -26,6 +37,8 @@
@RequestMapping("/v1/admin/airdata")
public class AirDataController {
private final AirDataService airDataService;
+ private PermissionConfig permissionConfig;
+ private RedisUtils redisUtils;
/**
* 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
@@ -34,32 +47,64 @@
* @return
*/
@GetMapping("/listAirData")
- public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+ public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.AIR_DATA_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<AirDataBo> list = airDataService.listAirDataByKeyword(baseConditionVO, keyword);
return ResponseUtil.successPage(list);
}
- /**
- * 鏌ヨ澶ф皵璁惧MAC鍦板潃
- *
- * @return
- */
- @GetMapping("/listAirEquipmentMAC")
- public ResponseVO<Object> listAirEquipmentMAC() {
- List<String> list = airDataService.listAirEquipmentMAC();
- return ResponseUtil.success(list);
- }
-
@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");
- IRequestFrame build = FrameBuilder.builderA5().innerFrame(new AirDataReqInnerFrame())
- .orderType(AtmoFunctionCode.QueryHeartBeat.getCode()).build();
+ List<String> success = new ArrayList<>();
+ List<String> failed = new ArrayList<>();
- WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> a5LightBrightnessRespInnerFrameWrapResponseCommonFrame =
- MainBoardInvokeSyncService.getInstance().sendRRPC(listMac.get(0), build, A5LightBrightnessRespInnerFrame.class);
+ listMac.parallelStream().forEach(macStr -> {
+ try {
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(macStr, "澶ф皵璁惧-蹇冭烦鍖�", a5Frame, commonFrame);
+ System.out.println(commonFrame + " -----------commonFrame");
+ AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame);
+ if (commonFrame != null) {
- return ResponseUtil.success(a5LightBrightnessRespInnerFrameWrapResponseCommonFrame);
+ //瀛樼紦瀛樺績璺冲寘
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + macStr, commonFrame);
+ //瀛樼紦瀛樼姸鎬�
+ RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + macStr, commonFrame, 300L);
+
+ success.add(macStr);
+ } else {
+ failed.add(macStr);
+ }
+ } catch (Exception e) {
+ failed.add(macStr);
+ }
+ });
+
+ Map<String, List> resultMap = new HashMap<>();
+ resultMap.put("success", success);
+ resultMap.put("failed", failed);
+
+ /**
+ * 鏈嶅姟绔洿鏂板ぇ姘旀暟鎹棩蹇楄褰曞紑濮�
+ */
+ String content = "鏇存柊缁撴灉锛�" + resultMap.toString();
+
+
+ StoreOperationRecordsUtils.storeOperationData(listMac, null, "鏈嶅姟绔洿鏂板ぇ姘旀暟鎹�", content);
+ /**
+ * 鏈嶅姟绔洿鏂板ぇ姘旀暟鎹棩蹇楄褰曠粨鏉�
+ */
+
+ return ResponseUtil.success(resultMap);
}
}
--
Gitblit v1.9.3