From b67bd85fbe51486dcacf5a5e3b308e4a0f3e2e43 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期日, 24 四月 2022 18:35:42 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 32 +++++++++++++-------------------
1 files changed, 13 insertions(+), 19 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 aa0497b..869765b 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,19 @@
package com.sandu.ximon.admin.controller;
+import com.alibaba.fastjson.JSON;
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.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
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.dao.bo.AirDataBo;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -26,6 +30,7 @@
@RequestMapping("/v1/admin/airdata")
public class AirDataController {
private final AirDataService airDataService;
+ private PermissionConfig permissionConfig;
/**
* 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
@@ -35,6 +40,9 @@
*/
@GetMapping("/listAirData")
public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(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);
}
@@ -54,7 +62,6 @@
public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
AirDataReqInnerFrame airDataReqInnerFrame = new AirDataReqInnerFrame();
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), airDataReqInnerFrame);
-
// WrapResponseCommonFrame<A5AtmosphereHeartbeatReportInnerFrame> wrapResponseCommonFrame =
// MainBoardInvokeSyncService.getInstance().sendRRPC(listMac.get(0), a5Frame, A5AtmosphereHeartbeatReportInnerFrame.class);
@@ -62,9 +69,13 @@
List<String> failed = new ArrayList<>();
listMac.parallelStream().forEach(macStr -> {
-// System.out.println(System.currentTimeMillis()+" -------------");
try {
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
+// //娴嬭瘯鐢ㄧ殑
+// String s = "{\"connectType\":\"FE\",\"crc32\":\"8685DF1B\",\"functionCode\":\"A5\",\"orderType\":\"84\",\"payload\":\"F0010022FFFF0101016666640000000000000000419D000000360089000000000002019300008CA14C69\",\"payloadLength\":\"002A\",\"validate\":true}";
+// CommonFrame commonFrame1 = JSON.parseObject(s, CommonFrame.class);
+// AirDataProcessor.getInstance().process("a1JsfPG4iKW",macStr,commonFrame1);
+ AirDataProcessor.getInstance().process("a1JsfPG4iKW",macStr,commonFrame);
if (commonFrame != null) {
success.add(macStr);
} else {
@@ -73,24 +84,7 @@
} catch (Exception e) {
failed.add(macStr);
}
-// System.out.println(System.currentTimeMillis());
});
-
-
-// for (String macStr : listMac) {
-// System.out.println(System.currentTimeMillis()+" -------------");
-// try {
-// CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
-// if (commonFrame != null) {
-// success.add(macStr);
-// } else {
-// failed.add(macStr);
-// }
-// } catch (Exception e) {
-// failed.add(macStr);
-// }
-// System.out.println(System.currentTimeMillis());
-// }
Map<String, List> resultMap = new HashMap<>();
resultMap.put("success", success);
--
Gitblit v1.9.3