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

win代码上传

detached
zouyiqing 2024-01-09 10:30:52 +08:00
parent 892e3ee054
commit 1ff58c939e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.entity.SysRadar;
import com.ruoyi.common.core.page.PageDomain; import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.page.TableSupport; import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils; 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;
@ -84,19 +85,25 @@ public class RadarStatusController
ModbusResponse modbusResponse = ModbusUtils.holdingRegister(); ModbusResponse modbusResponse = ModbusUtils.holdingRegister();
System.out.println(modbusResponse); System.out.println(modbusResponse);
String tag = modbusResponse.getTagId(); String tag = modbusResponse.getTagId();
SysIdentifier sysIdentifier = identifierService.selectIdentifierByTag(tag);
PrimaryRadarData primaryRadarData = new PrimaryRadarData(); PrimaryRadarData primaryRadarData = new PrimaryRadarData();
if (!"0".equals(modbusResponse.getTagId())) {
SysIdentifier sysIdentifier = identifierService.selectIdentifierByTag(tag);
primaryRadarData.setLadleNumber(sysIdentifier.getLadleNumber());
}
BeanUtils.copyProperties(modbusResponse,primaryRadarData); BeanUtils.copyProperties(modbusResponse,primaryRadarData);
primaryRadarData.setRadarLocation(radar.getRadarLocation()); primaryRadarData.setRadarLocation(radar.getRadarLocation());
primaryRadarData.setRadarIp(radar.getRadarIp()); primaryRadarData.setRadarIp(radar.getRadarIp());
primaryRadarData.setLadleNumber(sysIdentifier.getLadleNumber());
primaryRadarDataService.insertPrimaryRadarData(primaryRadarData); if (modbusResponse.getValue4()!=null && !"0".equals(modbusResponse.getValue4())) {
primaryRadarDataService.insertPrimaryRadarData(primaryRadarData);
}
RadarStatusWebSocket.sendToAll(modbusResponse.toString()); RadarStatusWebSocket.sendToAll(modbusResponse.toString());
} }
} catch (Exception e) { } catch (Exception e) {
if (e.equals("java.net.SocketTimeoutException: connect timed out")) { if (e.equals("java.net.SocketTimeoutException: connect timed out")) {
System.err.println("从串口读取失败:" + "连接超时"); System.err.println("从串口读取失败:" + "连接超时");
} }
e.printStackTrace();
} }
} }
}; };