From 0a46052a92d5685a47c786ebe85c6901bb848e32 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 14 十月 2022 18:49:24 +0800
Subject: [PATCH] 固件升级
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java | 49 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 39 insertions(+), 10 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java
index b9c0fbd..e144129 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java
@@ -6,19 +6,24 @@
*/
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
+import com.sandu.common.util.SpringContextHolder;
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.AirDataNewReqInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.AirDataReqInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5AtmosphereNewHeartbeatReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.request.AtmosphereNewReqInnerFrame;
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.AirDataNongGengService;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
+import com.sandu.ximon.dao.bo.AirDataNongGengBo;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
@@ -30,13 +35,16 @@
*/
@RestController
@AllArgsConstructor
+@Slf4j
@RequestMapping("/v1/admin/airdata_nonggeng")
public class AirDataNongGengController {
+ private PermissionConfig permissionConfig;
+ private final AirDataNongGengService airDataNongGengService;
@PostMapping("/updateAirEquipmentInfo")
public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
- AirDataNewReqInnerFrame airDataNewReqInnerFrame = new AirDataNewReqInnerFrame();
- A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), airDataNewReqInnerFrame);
+ AtmosphereNewReqInnerFrame atmosphereNewReqInnerFrame = new AtmosphereNewReqInnerFrame();
+ A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), atmosphereNewReqInnerFrame);
System.out.println(a5Frame + " --------a5Frame");
List<String> success = new ArrayList<>();
@@ -45,8 +53,15 @@
try {
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
+ StoreOperationRecordsUtils.storeInnerFrameData(macStr, "澶ф皵璁惧-蹇冭烦鍖�", a5Frame, commonFrame);
System.out.println(commonFrame + " -----------commonFrame");
- AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame);
+ A5AtmosphereNewHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5AtmosphereNewHeartbeatReportInnerFrame().transformFrame(commonFrame.getPayload());
+ if (heartbeatReportInnerFrame != null && heartbeatReportInnerFrame.isValidate()) {
+ log.info(heartbeatReportInnerFrame.toString());
+ SpringContextHolder.getBean(AirDataNongGengService.class).saveReportData(macStr, heartbeatReportInnerFrame.getHeartBeatDataPackage());
+ } else {
+ System.out.println("鏁版嵁鏍￠獙寮傚父锛�");
+ }
if (commonFrame != null) {
success.add(macStr);
} else {
@@ -61,6 +76,20 @@
resultMap.put("success", success);
resultMap.put("failed", failed);
return ResponseUtil.success(resultMap);
-
}
+
+ /**
+ * 鏌ヨ澶ф皵鏁版嵁妯＄硦鏌ヨ
+ *
+ * @param keyword 鍏抽敭瀛�
+ * @return
+ */
+// @GetMapping("/listAirData")
+// public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+// if (!permissionConfig.check(MenuEnum.AIR_DATA__NONG_GENG_LIST.getCode())) {
+// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+// }
+// List<AirDataNongGengBo> list = airDataNongGengService.listAirDataByKeyword(baseConditionVO, keyword);
+// return ResponseUtil.successPage(list);
+// }
}
--
Gitblit v1.9.3