From cfb17d6e329f3cc7afe3018d6cc8784ebafd5965 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 14 九月 2022 16:08:57 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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 6bf865a..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,11 +1,12 @@
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;
@@ -42,11 +43,26 @@
* @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);
+ CommonPage commonPage = airDataService.listAirDataByKeyword(baseConditionVO, keyword);
+ return ResponseUtil.success(commonPage);
+ }
+
+ /**
+ * 鏌ヨ澶ф皵鏁版嵁鍘嗗彶
+ *
+ * @param deviceMac 璁惧鍙�
+ * @return
+ */
+ @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);
}
@@ -55,7 +71,7 @@
if (!permissionConfig.check(MenuEnum.AIR_DATA_UPDATE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- AirDataReqInnerFrame airDataReqInnerFrame = new AirDataReqInnerFrame();
+ AtmosphereHeartBeatReqInnerFrame airDataReqInnerFrame = new AtmosphereHeartBeatReqInnerFrame();
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), airDataReqInnerFrame);
System.out.println(a5Frame + " --------a5Frame");
@@ -88,6 +104,17 @@
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