|
|
|
@@ -5,22 +5,17 @@ import com.alibaba.fastjson.JSON; |
|
|
|
import com.alibaba.fastjson.JSONObject; |
|
|
|
import com.alibaba.nacos.api.exception.NacosException; |
|
|
|
import com.aliyun.tea.utils.StringUtils; |
|
|
|
import com.baomidou.dynamic.datasource.annotation.DSTransactional; |
|
|
|
import com.xueyi.common.core.constant.nacos.NacosConstants; |
|
|
|
import com.xueyi.common.web.entity.service.impl.BaseServiceImpl; |
|
|
|
import com.xueyi.system.api.digitalmans.domain.dto.DmManDeviceDto; |
|
|
|
import com.xueyi.system.digitalmans.domain.dto.DmDigitalmanDto; |
|
|
|
import com.xueyi.system.digitalmans.domain.dto.DmDigitalmanExtDto; |
|
|
|
import com.xueyi.system.digitalmans.domain.query.DmDigitalmanExtQuery; |
|
|
|
import com.xueyi.system.digitalmans.domain.query.DmManDeviceQuery; |
|
|
|
import com.xueyi.system.digitalmans.manager.IDmDigitalmanExtManager; |
|
|
|
import com.xueyi.system.digitalmans.manager.IDmManDeviceManager; |
|
|
|
import com.xueyi.system.digitalmans.service.IDmManDeviceService; |
|
|
|
import com.xueyi.system.resource.domain.dto.DmH5ConfigDto; |
|
|
|
import com.xueyi.system.resource.domain.query.DmH5ConfigQuery; |
|
|
|
import com.xueyi.system.resource.manager.IDmH5ConfigManager; |
|
|
|
import com.xueyi.system.resource.manager.impl.DmH5ConfigManager; |
|
|
|
import com.xueyi.system.resource.service.IDmH5ConfigService; |
|
|
|
import com.xueyi.system.resource.manager.IDmH5ConfigManager; |
|
|
|
import com.xueyi.common.web.entity.service.impl.BaseServiceImpl; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
@@ -29,7 +24,6 @@ import org.springframework.stereotype.Service; |
|
|
|
import java.io.Serializable; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Objects; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
/** |
|
|
|
@@ -229,7 +223,8 @@ public class DmH5ConfigServiceImpl extends BaseServiceImpl<DmH5ConfigQuery, DmH5 |
|
|
|
H5.put("streamUrl", streamUrl); |
|
|
|
} |
|
|
|
} |
|
|
|
result = jo.toString(); |
|
|
|
if (jo != null) |
|
|
|
result = jo.toString(); |
|
|
|
dto.setProperty(result); |
|
|
|
} |
|
|
|
return dto; |
|
|
|
@@ -271,7 +266,8 @@ public class DmH5ConfigServiceImpl extends BaseServiceImpl<DmH5ConfigQuery, DmH5 |
|
|
|
H5.put("streamUrl", streamUrl); |
|
|
|
} |
|
|
|
} |
|
|
|
result = jo.toString(); |
|
|
|
if (jo != null) |
|
|
|
result = jo.toString(); |
|
|
|
return result; |
|
|
|
} else { |
|
|
|
return result; |
|
|
|
|