From f20a2f1d4098f1ce946918d1dfc71344c899e73b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E8=88=AA?= <653809315@qq.com> Date: Mon, 8 Jan 2024 15:00:35 +0800 Subject: [PATCH] commit --- .../controller/system/RadarStatusController.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RadarStatusController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RadarStatusController.java index 01dbe05..9f6de3e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RadarStatusController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RadarStatusController.java @@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system; import com.alibaba.fastjson.JSON; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.CxSelect; +import com.ruoyi.common.core.domain.entity.PrimaryRadarData; import com.ruoyi.common.core.domain.entity.SysIdentifier; import com.ruoyi.common.core.domain.entity.SysRadar; import com.ruoyi.common.core.page.PageDomain; @@ -11,9 +12,12 @@ import com.ruoyi.common.core.page.TableSupport; import com.ruoyi.common.json.JSONObject; import com.ruoyi.common.json.JSONObject.JSONArray; import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.bean.ModbusResponse; import com.ruoyi.common.utils.modbus.ModbusUtils; +import com.ruoyi.framework.web.domain.server.Sys; import com.ruoyi.system.service.ISysRadarService; +import com.ruoyi.system.service.PrimaryRadarDataService; import com.serotonin.modbus4j.ModbusMaster; import com.serotonin.modbus4j.exception.ErrorResponseException; import com.serotonin.modbus4j.exception.ModbusTransportException; @@ -44,6 +48,8 @@ public class RadarStatusController @Autowired private ISysRadarService service; + @Autowired + private PrimaryRadarDataService primaryRadarDataService; private String prefix = "/system/radarStatus"; @@ -82,9 +88,17 @@ public class RadarStatusController } return responses; }); + try { + Thread.sleep(1000); // 睡眠1秒钟 + } catch (InterruptedException e) { + e.printStackTrace(); + } listCompletableFuture.thenAccept(modbusResponses -> { for (ModbusResponse modbusResponse : modbusResponses) { System.out.println(modbusResponse); + PrimaryRadarData primaryRadarData = new PrimaryRadarData(); + BeanUtils.copyProperties(modbusResponse, primaryRadarData); + primaryRadarDataService.insertPrimaryRadarData(primaryRadarData); } }); PageDomain pageDomain = TableSupport.buildPageRequest();