From 60519a0859c82ff3dffd3788563d7e7f61fe1a6f Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 15 二月 2022 17:59:13 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 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 9e159e4..98e3b0e 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,9 +1,18 @@
package com.sandu.ximon.admin.controller;
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.frame.FrameBuilder;
+import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.request.AirDataReqInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.response.A5LightBrightnessRespInnerFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
+import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.service.AirDataService;
-import com.sandu.ximon.dao.domain.AirData;
+import com.sandu.ximon.dao.bo.AirDataBo;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -18,20 +27,39 @@
public class AirDataController {
private final AirDataService airDataService;
- @GetMapping
- public ResponseVO<Object> listAirData() {
- List<AirData> list = airDataService.listAirData();
+ /**
+ * 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
+ *
+ * @param keyword 鍏抽敭瀛�
+ * @return
+ */
+ @GetMapping("/listAirData")
+ public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
+ 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.successPage(list);
+ return ResponseUtil.success(list);
+ }
+
+ @PostMapping("/updateAirEquipmentInfo")
+ public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
+
+ IRequestFrame build = FrameBuilder.builderA5().innerFrame(new AirDataReqInnerFrame())
+ .orderType(AtmoFunctionCode.QueryHeartBeat.getCode()).build();
+
+ WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> a5LightBrightnessRespInnerFrameWrapResponseCommonFrame =
+ MainBoardInvokeSyncService.getInstance().sendRRPC(listMac.get(0), build, A5LightBrightnessRespInnerFrame.class);
+
+ return ResponseUtil.success(a5LightBrightnessRespInnerFrameWrapResponseCommonFrame);
}
}
--
Gitblit v1.9.3