From 7b4e8c2fa93a973ed29c9f7ee1a5b9e539f85e1d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 14 十月 2022 18:50:03 +0800
Subject: [PATCH] 大气农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataNongGengController.java | 53 -----------------------------------------------------
1 files changed, 0 insertions(+), 53 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 e144129..8225b5b 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
@@ -5,30 +5,12 @@
* @date 2022/4/24 17:36
*/
-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.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 lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* 澶ф皵鏁版嵁
@@ -41,42 +23,7 @@
private PermissionConfig permissionConfig;
private final AirDataNongGengService airDataNongGengService;
- @PostMapping("/updateAirEquipmentInfo")
- public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
- AtmosphereNewReqInnerFrame atmosphereNewReqInnerFrame = new AtmosphereNewReqInnerFrame();
- A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), atmosphereNewReqInnerFrame);
- System.out.println(a5Frame + " --------a5Frame");
- List<String> success = new ArrayList<>();
- List<String> failed = new ArrayList<>();
- listMac.parallelStream().forEach(macStr -> {
- try {
-
- CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
- StoreOperationRecordsUtils.storeInnerFrameData(macStr, "澶ф皵璁惧-蹇冭烦鍖�", a5Frame, commonFrame);
- System.out.println(commonFrame + " -----------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 {
- 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