功能完善

liuhaonan

2022-02-18 81d00b6d3079d721b8c0d2ffa6ef51c10a433eae

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirDataController.java

@@ -18,8 +18,6 @@
import java.util.List;
import java.util.Map;

import static jodd.util.ThreadUtil.sleep;

/**
 * 大气数据
 */
@@ -63,8 +61,8 @@
        List<String> success = new ArrayList<>();
        List<String> failed = new ArrayList<>();

        for (String macStr : listMac) {

        listMac.parallelStream().forEach(macStr -> {
//            System.out.println(System.currentTimeMillis()+"       -------------");
            try {
                CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
                if (commonFrame != null) {
@@ -75,19 +73,29 @@
            } catch (Exception e) {
                failed.add(macStr);
            }
            System.out.println(System.currentTimeMillis());
        }
//            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);
        resultMap.put("failed", failed);

//        System.out.println("commonFrame"+commonFrame);
//        System.out.println(wrapResponseCommonFrame);

//        A5AtmosphereHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5AtmosphereHeartbeatReportInnerFrame().transformFrame(wrapResponseCommonFrame.getPayload());

//        System.out.println(heartbeatReportInnerFrame);
//        return ResponseUtil.success(a5LightBrightnessRespInnerFrameWrapResponseCommonFrame);
        return ResponseUtil.success(resultMap);
    }