Showing
1 changed file
with
1 additions
and
6 deletions
| @@ -895,9 +895,8 @@ public abstract class BaseController { | @@ -895,9 +895,8 @@ public abstract class BaseController { | ||
| 895 | * 构建设备配置的配置数据 | 895 | * 构建设备配置的配置数据 |
| 896 | * @param transportType 产品的通信协议 | 896 | * @param transportType 产品的通信协议 |
| 897 | * @param deviceProfileData 空的设备配置数据 | 897 | * @param deviceProfileData 空的设备配置数据 |
| 898 | - * @param scriptText 自定义数据协议的解析脚本 | ||
| 899 | */ | 898 | */ |
| 900 | - protected DeviceProfileData buildDeviceProfileData(String transportType,DeviceProfileData deviceProfileData,String scriptText) { | 899 | + protected DeviceProfileData buildDeviceProfileData(String transportType,DeviceProfileData deviceProfileData) { |
| 901 | if(null == deviceProfileData){ | 900 | if(null == deviceProfileData){ |
| 902 | deviceProfileData = new DeviceProfileData(); | 901 | deviceProfileData = new DeviceProfileData(); |
| 903 | } | 902 | } |
| @@ -907,10 +906,6 @@ public abstract class BaseController { | @@ -907,10 +906,6 @@ public abstract class BaseController { | ||
| 907 | // 传输类型默认都是Default | 906 | // 传输类型默认都是Default |
| 908 | if(transportType ==null || DeviceTransportType.DEFAULT.name().equals(transportType)){ | 907 | if(transportType ==null || DeviceTransportType.DEFAULT.name().equals(transportType)){ |
| 909 | deviceProfileData.setTransportConfiguration(new DefaultDeviceProfileTransportConfiguration()); | 908 | deviceProfileData.setTransportConfiguration(new DefaultDeviceProfileTransportConfiguration()); |
| 910 | - }else if(DeviceTransportType.TCP.name().equals(transportType)){ | ||
| 911 | - TkTcpDeviceProfileTransportConfiguration tcpDeviceProfileTransportConfiguration = (TkTcpDeviceProfileTransportConfiguration) deviceProfileData.getTransportConfiguration(); | ||
| 912 | - tcpDeviceProfileTransportConfiguration.setScriptText(scriptText); | ||
| 913 | - deviceProfileData.setTransportConfiguration(tcpDeviceProfileTransportConfiguration); | ||
| 914 | }else{ | 909 | }else{ |
| 915 | deviceProfileData.setTransportConfiguration(deviceProfileData.getTransportConfiguration()); | 910 | deviceProfileData.setTransportConfiguration(deviceProfileData.getTransportConfiguration()); |
| 916 | } | 911 | } |