From db79eca1d06cc0f3cfb5aae710262aedfb95577e Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 22 三月 2022 14:35:22 +0800
Subject: [PATCH] c3m退款实现
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 62 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 11 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 2f334d0..b65653d 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,13 +1,24 @@
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.dao.bo.AirDataBo;
+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.service.AirDataService;
+import com.sandu.ximon.dao.bo.AirDataBo;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 澶ф皵鏁版嵁
@@ -18,21 +29,15 @@
public class AirDataController {
private final AirDataService airDataService;
- @GetMapping
- public ResponseVO<Object> listAirData() {
- List<AirDataBo> list = airDataService.listAirData();
- return ResponseUtil.successPage(list);
- }
-
/**
* 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
*
* @param keyword 鍏抽敭瀛�
* @return
*/
- @GetMapping("/listAirDataByKeyword/{keyword}")
- public ResponseVO<Object> listAirDataByKeyword(@PathVariable String keyword) {
- List<AirDataBo> list = airDataService.listAirDataByKeyword(keyword);
+ @GetMapping("/listAirData")
+ public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+ List<AirDataBo> list = airDataService.listAirDataByKeyword(baseConditionVO, keyword);
return ResponseUtil.successPage(list);
}
@@ -44,7 +49,42 @@
@GetMapping("/listAirEquipmentMAC")
public ResponseVO<Object> listAirEquipmentMAC() {
List<String> list = airDataService.listAirEquipmentMAC();
- return ResponseUtil.successPage(list);
+ return ResponseUtil.success(list);
+ }
+
+ @PostMapping("/updateAirEquipmentInfo")
+ 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);
+
+ List<String> success = new ArrayList<>();
+ List<String> failed = new ArrayList<>();
+
+ listMac.parallelStream().forEach(macStr -> {
+ 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 {
+ failed.add(macStr);
+ }
+ } catch (Exception e) {
+ failed.add(macStr);
+ }
+ });
+
+ Map<String, List> resultMap = new HashMap<>();
+ resultMap.put("success", success);
+ resultMap.put("failed", failed);
+
+ return ResponseUtil.success(resultMap);
}
}
--
Gitblit v1.9.3