wyh
/
dianci
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

commit

detached
王宇航 2024-01-08 14:41:29 +08:00
parent 756062c666
commit c4530afc61
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/RadarStatusController.java
View File

@ -11,7 +11,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.ModbusResponse;
import com.ruoyi.common.utils.modbus.ModbusUtils;
import com.ruoyi.system.service.ISysRadarService; import com.ruoyi.system.service.ISysRadarService;
import com.serotonin.modbus4j.ModbusMaster;
import com.serotonin.modbus4j.exception.ErrorResponseException;
import com.serotonin.modbus4j.exception.ModbusTransportException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
@ -57,6 +62,19 @@ public class RadarStatusController
{ {
TableDataInfo rspData = new TableDataInfo(); TableDataInfo rspData = new TableDataInfo();
List<SysRadar> radarList = service.selectRadarList(sysRadar); List<SysRadar> radarList = service.selectRadarList(sysRadar);
for (SysRadar radar : radarList) {
while (true){
ModbusMaster master = ModbusUtils.getSlave(radar.getRadarIp(), 23);
try {
ModbusResponse modbusResponse = ModbusUtils.holdingRegister();
System.out.println(modbusResponse);
} catch (ModbusTransportException e) {
throw new RuntimeException(e);
} catch (ErrorResponseException e) {
throw new RuntimeException(e);
}
}
}
PageDomain pageDomain = TableSupport.buildPageRequest(); PageDomain pageDomain = TableSupport.buildPageRequest();
if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize()) if (null == pageDomain.getPageNum() || null == pageDomain.getPageSize())
{ {

8
ruoyi-common/src/main/java/com/ruoyi/common/utils/modbus/ModbusUtils.java
View File

@ -20,10 +20,10 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@Slf4j @Slf4j
public class ModbusUtils { public class ModbusUtils {
private final ModbusFactory modbusFactory = new ModbusFactory(); private static final ModbusFactory modbusFactory = new ModbusFactory();
private static ModbusMaster master; private static ModbusMaster master;
public ModbusResponse holdingRegister() throws ModbusTransportException, ErrorResponseException { public static ModbusResponse holdingRegister() throws ModbusTransportException, ErrorResponseException {
BatchRead<Integer> batch = new BatchRead<>(); BatchRead<Integer> batch = new BatchRead<>();
int startLength = 0; int startLength = 0;
int endLength = 11; int endLength = 11;
@ -64,7 +64,7 @@ public class ModbusUtils {
* @return * @return
* @throws ModbusInitException * @throws ModbusInitException
*/ */
public ModbusMaster getSlave(String ip, Integer port) { public static ModbusMaster getSlave(String ip, Integer port) {
try { try {
IpParameters params = new IpParameters(); IpParameters params = new IpParameters();
params.setHost(ip); params.setHost(ip);
@ -92,7 +92,7 @@ public class ModbusUtils {
public int getValueType(String type) { public static int getValueType(String type) {
switch (type) { switch (type) {
case "Integer": case "Integer":
return DataType.TWO_BYTE_INT_SIGNED; return DataType.TWO_BYTE_INT_SIGNED;