Commit d988b83d92ef001815bec037e0c1e7e357eee5e0

Authored by 芯火源
1 parent 102e039b

refactor: 代码合并遗留部分

... ... @@ -895,9 +895,8 @@ public abstract class BaseController {
895 895 * 构建设备配置的配置数据
896 896 * @param transportType 产品的通信协议
897 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 900 if(null == deviceProfileData){
902 901 deviceProfileData = new DeviceProfileData();
903 902 }
... ... @@ -907,10 +906,6 @@ public abstract class BaseController {
907 906 // 传输类型默认都是Default
908 907 if(transportType ==null || DeviceTransportType.DEFAULT.name().equals(transportType)){
909 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 909 }else{
915 910 deviceProfileData.setTransportConfiguration(deviceProfileData.getTransportConfiguration());
916 911 }
... ...