|
|
@@ -1,9 +1,11 @@
|
|
|
package com.ruoyi.data.service.impl;
|
|
|
|
|
|
import com.ruoyi.common.utils.ModbusUtils;
|
|
|
+import com.ruoyi.common.utils.mqtt.MQTTConnect;
|
|
|
import com.ruoyi.data.domain.DataFormatBean;
|
|
|
import com.ruoyi.data.domain.TblDatapoint;
|
|
|
import com.ruoyi.data.domain.TblModbusTcp;
|
|
|
+import com.ruoyi.data.domain.TblMqtt;
|
|
|
import com.ruoyi.data.mapper.TblDatapointMapper;
|
|
|
import com.ruoyi.data.mapper.TblModbusTcpMapper;
|
|
|
import com.ruoyi.data.service.DataDealservice;
|
|
|
@@ -22,7 +24,8 @@ public class DataDealServiceImpl implements DataDealservice {
|
|
|
|
|
|
private final ModbusUtils modbusUtils;
|
|
|
@Override
|
|
|
- public void getModBusTcp(DataFormatBean dataFormatBean) {
|
|
|
+ public String getModBusTcp(DataFormatBean dataFormatBean) {
|
|
|
+ String value = "";
|
|
|
TblDatapoint tblDatapoint = datapointMapper.selectById(dataFormatBean.getPointId());
|
|
|
TblModbusTcp tblModbusTcp = tblModbusTcpMapper.selectById(dataFormatBean.getModbusUuId());
|
|
|
String str = "holding-register:"+(tblDatapoint.getAddr()+tblDatapoint.getAddrOffset())+":UINT["+tblDatapoint.getLen()+"]";
|
|
|
@@ -30,10 +33,11 @@ public class DataDealServiceImpl implements DataDealservice {
|
|
|
String connectKey = "tcp"+tblModbusTcp.getUuid();
|
|
|
String dataKey = "tcp"+tblDatapoint.getId().toString();
|
|
|
try{
|
|
|
- modbusUtils.plcRead(url,connectKey,dataKey,str);
|
|
|
+ value = modbusUtils.plcRead(url,connectKey,dataKey,str);
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
+ return value;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -63,5 +67,25 @@ public class DataDealServiceImpl implements DataDealservice {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public void createMqttConnect(TblMqtt tblMqtt) {
|
|
|
+ MQTTConnect mqttConnect = new MQTTConnect();
|
|
|
+ try {
|
|
|
+ mqttConnect.createMqttConnect(tblMqtt.getServerAddress(),tblMqtt.getUuid(),tblMqtt.getAccount(),tblMqtt.getPassword());
|
|
|
+ }catch (Exception e){
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void pubMqttClient(TblMqtt tblMqtt,String topic,int qos,String msg) {
|
|
|
+ MQTTConnect mqttConnect = new MQTTConnect();
|
|
|
+ try {
|
|
|
+ mqttConnect.pubMqttClient(tblMqtt.getServerAddress(),tblMqtt.getUuid(),tblMqtt.getAccount(),tblMqtt.getPassword(),topic,qos,msg);
|
|
|
+ }catch (Exception e){
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|