From 313a83d090e83bf7d2f8f7c9c70807a6486bc690 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 26 八月 2022 14:52:56 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 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 10e620e..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;
@@ -13,6 +14,7 @@
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;
@@ -41,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);
}
@@ -54,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");
@@ -64,6 +81,7 @@
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) {
@@ -86,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