commit
parent
e602ff151f
commit
f20a2f1d40
|
|
@ -3,6 +3,7 @@ package com.ruoyi.web.controller.system;
|
||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.ruoyi.common.core.domain.AjaxResult;
|
import com.ruoyi.common.core.domain.AjaxResult;
|
||||||
import com.ruoyi.common.core.domain.CxSelect;
|
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.SysIdentifier;
|
||||||
import com.ruoyi.common.core.domain.entity.SysRadar;
|
import com.ruoyi.common.core.domain.entity.SysRadar;
|
||||||
import com.ruoyi.common.core.page.PageDomain;
|
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;
|
||||||
import com.ruoyi.common.json.JSONObject.JSONArray;
|
import com.ruoyi.common.json.JSONObject.JSONArray;
|
||||||
import com.ruoyi.common.utils.StringUtils;
|
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.bean.ModbusResponse;
|
||||||
import com.ruoyi.common.utils.modbus.ModbusUtils;
|
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.ISysRadarService;
|
||||||
|
import com.ruoyi.system.service.PrimaryRadarDataService;
|
||||||
import com.serotonin.modbus4j.ModbusMaster;
|
import com.serotonin.modbus4j.ModbusMaster;
|
||||||
import com.serotonin.modbus4j.exception.ErrorResponseException;
|
import com.serotonin.modbus4j.exception.ErrorResponseException;
|
||||||
import com.serotonin.modbus4j.exception.ModbusTransportException;
|
import com.serotonin.modbus4j.exception.ModbusTransportException;
|
||||||
|
|
@ -44,6 +48,8 @@ public class RadarStatusController
|
||||||
@Autowired
|
@Autowired
|
||||||
private ISysRadarService service;
|
private ISysRadarService service;
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private PrimaryRadarDataService primaryRadarDataService;
|
||||||
|
|
||||||
private String prefix = "/system/radarStatus";
|
private String prefix = "/system/radarStatus";
|
||||||
|
|
||||||
|
|
@ -82,9 +88,17 @@ public class RadarStatusController
|
||||||
}
|
}
|
||||||
return responses;
|
return responses;
|
||||||
});
|
});
|
||||||
|
try {
|
||||||
|
Thread.sleep(1000); // 睡眠1秒钟
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
listCompletableFuture.thenAccept(modbusResponses -> {
|
listCompletableFuture.thenAccept(modbusResponses -> {
|
||||||
for (ModbusResponse modbusResponse : modbusResponses) {
|
for (ModbusResponse modbusResponse : modbusResponses) {
|
||||||
System.out.println(modbusResponse);
|
System.out.println(modbusResponse);
|
||||||
|
PrimaryRadarData primaryRadarData = new PrimaryRadarData();
|
||||||
|
BeanUtils.copyProperties(modbusResponse, primaryRadarData);
|
||||||
|
primaryRadarDataService.insertPrimaryRadarData(primaryRadarData);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
PageDomain pageDomain = TableSupport.buildPageRequest();
|
PageDomain pageDomain = TableSupport.buildPageRequest();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue