From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 75 +++++++++++++++++++++++++------------
1 files changed, 51 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 4014cc6..6ebbf44 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
@@ -1,15 +1,22 @@
package com.sandu.ximon.admin.controller;
+import com.sandu.common.domain.CommonPage;
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.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.request.AtmosphereHeartBeatReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
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.utils.RedisUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AirDataBo;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -17,8 +24,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
-import static jodd.util.ThreadUtil.sleep;
/**
* 澶ф皵鏁版嵁
@@ -28,6 +33,8 @@
@RequestMapping("/v1/admin/airdata")
public class AirDataController {
private final AirDataService airDataService;
+ private PermissionConfig permissionConfig;
+ private RedisUtils redisUtils;
/**
* 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
@@ -36,38 +43,54 @@
* @return
*/
@GetMapping("/listAirData")
- public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
- List<AirDataBo> list = airDataService.listAirDataByKeyword(baseConditionVO, keyword);
- return ResponseUtil.successPage(list);
+ public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.AIR_DATA_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ CommonPage commonPage = airDataService.listAirDataByKeyword(baseConditionVO, keyword);
+ return ResponseUtil.success(commonPage);
}
/**
- * 鏌ヨ澶ф皵璁惧MAC鍦板潃
+ * 鏌ヨ澶ф皵鏁版嵁鍘嗗彶
*
+ * @param deviceMac 璁惧鍙�
* @return
*/
- @GetMapping("/listAirEquipmentMAC")
- public ResponseVO<Object> listAirEquipmentMAC() {
- List<String> list = airDataService.listAirEquipmentMAC();
- return ResponseUtil.success(list);
+ @GetMapping("/listAirDataOfDeviceCode")
+ public ResponseVO<Object> listAirDataOfDeviceCode(BaseConditionVO baseConditionVO, @RequestParam(value = "deviceMac", required = false) String deviceMac) {
+ if (!permissionConfig.check(MenuEnum.AIR_DATA_LIST_HISTORY.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ List<AirDataBo> list = airDataService.listAirDataOfDeviceCode(baseConditionVO, deviceMac);
+ return ResponseUtil.successPage(list);
}
@PostMapping("/updateAirEquipmentInfo")
public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
- AirDataReqInnerFrame airDataReqInnerFrame = new AirDataReqInnerFrame();
+ if (!permissionConfig.check(MenuEnum.AIR_DATA_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ AtmosphereHeartBeatReqInnerFrame airDataReqInnerFrame = new AtmosphereHeartBeatReqInnerFrame();
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), airDataReqInnerFrame);
-
-// WrapResponseCommonFrame<A5AtmosphereHeartbeatReportInnerFrame> wrapResponseCommonFrame =
-// MainBoardInvokeSyncService.getInstance().sendRRPC(listMac.get(0), a5Frame, A5AtmosphereHeartbeatReportInnerFrame.class);
+ System.out.println(a5Frame + " --------a5Frame");
List<String> success = new ArrayList<>();
List<String> failed = new ArrayList<>();
- for (String macStr : listMac) {
-
+ 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) {
+
+ //瀛樼紦瀛樺績璺冲寘
+ 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);
@@ -75,19 +98,23 @@
} catch (Exception e) {
failed.add(macStr);
}
- System.out.println(System.currentTimeMillis());
- }
+ });
+
Map<String, List> resultMap = new HashMap<>();
resultMap.put("success", success);
resultMap.put("failed", failed);
-// System.out.println("commonFrame"+commonFrame);
-// System.out.println(wrapResponseCommonFrame);
+ /**
+ * 鏈嶅姟绔洿鏂板ぇ姘旀暟鎹棩蹇楄褰曞紑濮�
+ */
+ String content = "鏇存柊缁撴灉锛�" + resultMap.toString();
-// A5AtmosphereHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5AtmosphereHeartbeatReportInnerFrame().transformFrame(wrapResponseCommonFrame.getPayload());
-// System.out.println(heartbeatReportInnerFrame);
-// return ResponseUtil.success(a5LightBrightnessRespInnerFrameWrapResponseCommonFrame);
+ StoreOperationRecordsUtils.storeOperationData(listMac, null, "鏈嶅姟绔洿鏂板ぇ姘旀暟鎹�", content);
+ /**
+ * 鏈嶅姟绔洿鏂板ぇ姘旀暟鎹棩蹇楄褰曠粨鏉�
+ */
+
return ResponseUtil.success(resultMap);
}
--
Gitblit v1.9.3