修改bug，增加按id和mancode查询的接口

xueyi-common/xueyi-common-web/src/main/java/com/xueyi/common/web/entity/controller/BaseController.java

@@ -73,6 +73,10 @@ public abstract class BaseController<Q extends BaseEntity, D extends BaseEntity,
         return success(baseService.selectById(id));
     }
 
+    public AjaxResult getInfo(@PathVariable("id") Serializable id,@PathVariable("mancode") String mancode) {
+        return success(baseService.selectByIdCode(id, mancode));
+    }
+
     /**
      * 新增
      */

xueyi-common/xueyi-common-web/src/main/java/com/xueyi/common/web/entity/service/IBaseService.java

@@ -48,6 +48,8 @@ public interface IBaseService<Q extends BaseEntity, D extends BaseEntity> {
      */
     D selectById(Serializable id);
 
+    D selectByIdCode(Serializable id, String manCode);
+
     /**
      * 新增数据对象
      *

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/resource/controller/DmH5ConfigController.java

@@ -75,6 +75,13 @@ public class DmH5ConfigController extends BaseController<DmH5ConfigQuery, DmH5Co
         return super.getInfo(id);
     }
 
+    @Override
+    @GetMapping(value = "/{id}/{mancode}")
+    @RequiresPermissions(Auth.DM_H5_CONFIG_SINGLE)
+    public AjaxResult getInfo(@PathVariable("id") Serializable id,@PathVariable("mancode") String mancode) {
+        return super.getInfo(id, mancode);
+    }
+
 
     /**
      * H5配置表新增

xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/resource/service/impl/DmH5ConfigServiceImpl.java

@@ -73,16 +73,21 @@ public class DmH5ConfigServiceImpl extends BaseServiceImpl<DmH5ConfigQuery, DmH5
                     temp.setTenantName(items.getTenantName());
                     temp.setManCode(items.getManCode());
                     String streamUrl = items.getStreamUrl();
-                    JSONObject jo = JSON.parseObject(item.getProperty());
-                    if(jo.containsKey("system"))
-                    {
-                        JSONObject sys = jo.getJSONObject("System");
-                        if(sys.containsKey("H5")){
-                            JSONObject H5 = sys.getJSONObject("H5");
-                            H5.put("streamUrl", streamUrl);
+                    if(!streamUrl.isEmpty()){
+                        JSONObject jo = JSON.parseObject(item.getProperty());
+                        if(jo.containsKey("system"))
+                        {
+                            JSONObject sys = jo.getJSONObject("System");
+                            if(sys.containsKey("H5")){
+                                JSONObject H5 = sys.getJSONObject("H5");
+                                H5.put("streamUrl", streamUrl);
+                            }
                         }
+                        temp.setProperty(jo.toString());
+                    }
+                    else{
+                        temp.setProperty(item.getProperty());
                     }
-                    temp.setProperty(jo.toString());
                     temp.setEnterpriseId(item.getEnterpriseId());
                     temp.setName(item.getName());
                     temp.setId(item.getId());
@@ -197,6 +202,34 @@ public class DmH5ConfigServiceImpl extends BaseServiceImpl<DmH5ConfigQuery, DmH5
         return dto;
     }
 
+    @Override
+    public DmH5ConfigDto selectByIdCode(Serializable id, String manCode) {
+        DmH5ConfigDto dto = super.selectById(id);
+        String result = null;
+        try {
+            result = nacosConfigManager.getConfigService().getConfig(dto.getName(), NacosConstants.DEFAULT_GROUP, 5000);
+        } catch (NacosException ne) {
+            log.error("H5配置表nacos-获取配置文件失败：{}", ne.getMessage());
+        }
+        DmManDeviceQuery query = new DmManDeviceQuery();
+        query.setManCode(manCode);
+        List<DmManDeviceDto> extList = dmManDeviceManager.selectList(query);
+        if (extList != null && extList.size() > 0) {
+            String streamUrl = extList.get(0).getStreamUrl();
+            JSONObject jo = JSON.parseObject(result);
+            if (jo.containsKey("system")) {
+                JSONObject sys = jo.getJSONObject("System");
+                if (sys.containsKey("H5")) {
+                    JSONObject H5 = sys.getJSONObject("H5");
+                    H5.put("streamUrl", streamUrl);
+                }
+            }
+            result = jo.toString();
+            dto.setProperty(result);
+        }
+        return dto;
+    }
+
     @Override
     public String syncH5Config(Long tId, String manCode) {
         log.info("tenant_id:{}",tId);