修改bug

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

@@ -73,10 +73,6 @@ 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,8 +48,6 @@ 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,11 +75,11 @@ 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);
+        DmH5ConfigDto dto = baseService.selectbyIdCode(id, mancode);
+        return AjaxResult.success(dto);
     }
 
 

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

@@ -4,6 +4,8 @@ import com.xueyi.system.resource.domain.query.DmH5ConfigQuery;
 import com.xueyi.system.resource.domain.dto.DmH5ConfigDto;
 import com.xueyi.common.web.entity.service.IBaseService;
 
+import java.io.Serializable;
+
 /**
  * H5配置表管理 服务层
  *
@@ -18,4 +20,6 @@ public interface IDmH5ConfigService extends IBaseService<DmH5ConfigQuery, DmH5Co
         * @return 结果
         */
         public String syncH5Config(Long tId, String manCode);
+
+        public DmH5ConfigDto selectbyIdCode(Serializable id, String manCode);
 }

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

@@ -69,11 +69,11 @@ public class DmH5ConfigServiceImpl extends BaseServiceImpl<DmH5ConfigQuery, DmH5
             if (manDeviceDtos != null) {
                 for(int i=0;i<manDeviceDtos.size();i++){
                     DmManDeviceDto items = manDeviceDtos.get(i);
-                    DmH5ConfigDto temp = new DmH5ConfigDto();
-                    temp.setTenantName(items.getTenantName());
-                    temp.setManCode(items.getManCode());
                     String streamUrl = items.getStreamUrl();
                     if(!streamUrl.isEmpty()){
+                        DmH5ConfigDto temp = new DmH5ConfigDto();
+                        temp.setTenantName(items.getTenantName());
+                        temp.setManCode(items.getManCode());
                         JSONObject jo = JSON.parseObject(item.getProperty());
                         if(jo.containsKey("system"))
                         {
@@ -84,28 +84,25 @@ public class DmH5ConfigServiceImpl extends BaseServiceImpl<DmH5ConfigQuery, DmH5
                             }
                         }
                         temp.setProperty(jo.toString());
+                        temp.setEnterpriseId(item.getEnterpriseId());
+                        temp.setName(item.getName());
+                        temp.setId(item.getId());
+                        temp.setRemark(item.getRemark());
+                        temp.setStatus(item.getStatus());
+                        temp.setVersion(item.getVersion());
+                        temp.setCreateBy(item.getCreateBy());
+                        temp.setCreateTime(item.getCreateTime());
+                        temp.setUpdateBy(item.getUpdateBy());
+                        temp.setUpdateName(item.getUpdateName());
+                        temp.setUpdateTime(item.getUpdateTime());
+                        temp.setSourceName(item.getSourceName());
+                        temp.setSort(item.getSort());
+                        temp.setDelFlag(item.getDelFlag());
+                        temp.setParams(item.getParams());
+                        temp.setOperate(item.getOperate());
+                        temp.setCreateName(item.getCreateName());
+                        resultlist.add(temp);
                     }
-                    else{
-                        temp.setProperty(item.getProperty());
-                    }
-                    temp.setEnterpriseId(item.getEnterpriseId());
-                    temp.setName(item.getName());
-                    temp.setId(item.getId());
-                    temp.setRemark(item.getRemark());
-                    temp.setStatus(item.getStatus());
-                    temp.setVersion(item.getVersion());
-                    temp.setCreateBy(item.getCreateBy());
-                    temp.setCreateTime(item.getCreateTime());
-                    temp.setUpdateBy(item.getUpdateBy());
-                    temp.setUpdateName(item.getUpdateName());
-                    temp.setUpdateTime(item.getUpdateTime());
-                    temp.setSourceName(item.getSourceName());
-                    temp.setSort(item.getSort());
-                    temp.setDelFlag(item.getDelFlag());
-                    temp.setParams(item.getParams());
-                    temp.setOperate(item.getOperate());
-                    temp.setCreateName(item.getCreateName());
-                    resultlist.add(temp);
                 }
             }
         });
@@ -202,8 +199,7 @@ public class DmH5ConfigServiceImpl extends BaseServiceImpl<DmH5ConfigQuery, DmH5
         return dto;
     }
 
-    @Override
-    public DmH5ConfigDto selectByIdCode(Serializable id, String manCode) {
+    public DmH5ConfigDto selectbyIdCode(Serializable id, String manCode) {
         DmH5ConfigDto dto = super.selectById(id);
         String result = null;
         try {
@@ -216,6 +212,9 @@ public class DmH5ConfigServiceImpl extends BaseServiceImpl<DmH5ConfigQuery, DmH5
         List<DmManDeviceDto> extList = dmManDeviceManager.selectList(query);
         if (extList != null && extList.size() > 0) {
             String streamUrl = extList.get(0).getStreamUrl();
+            if(streamUrl.isEmpty()){
+                return null;
+            }
             JSONObject jo = JSON.parseObject(result);
             if (jo.containsKey("system")) {
                 JSONObject sys = jo.getJSONObject("System");