From 01b3916c90a92501df4bf992d3a686178eb240dd Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 11 五月 2022 16:06:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 52 +++++++++++++++++-----------------------------------
1 files changed, 17 insertions(+), 35 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 81b386b..f2be0f2 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,13 +3,17 @@
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.admin.utils.RedisUtils;
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 +21,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
-import static jodd.util.ThreadUtil.sleep;
/**
* 澶ф皵鏁版嵁
@@ -28,6 +30,8 @@
@RequestMapping("/v1/admin/airdata")
public class AirDataController {
private final AirDataService airDataService;
+ private PermissionConfig permissionConfig;
+ private RedisUtils redisUtils;
/**
* 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
@@ -37,37 +41,32 @@
*/
@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);
}
- /**
- * 鏌ヨ澶ф皵璁惧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);
-
-// 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<>();
- listMac.parallelStream().forEach(macStr ->{
-// System.out.println(System.currentTimeMillis()+" -------------");
+ listMac.parallelStream().forEach(macStr -> {
try {
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
+ System.out.println(commonFrame + " -----------commonFrame");
+ AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame);
if (commonFrame != null) {
+
success.add(macStr);
} else {
failed.add(macStr);
@@ -75,24 +74,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