处理海康空指针问题
parent
c346cd9d4e
commit
4574316eee
|
@ -8,6 +8,7 @@ import com.zcloud.util.Tools;
|
||||||
import com.zcloud.util.hk.HKUtil;
|
import com.zcloud.util.hk.HKUtil;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Controller;
|
import org.springframework.stereotype.Controller;
|
||||||
|
import org.springframework.util.ObjectUtils;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.ResponseBody;
|
import org.springframework.web.bind.annotation.ResponseBody;
|
||||||
|
|
||||||
|
@ -54,6 +55,9 @@ public class PlatformvideomanagementController extends BaseController {
|
||||||
Map<String,Object> map = new HashMap<String,Object>();
|
Map<String,Object> map = new HashMap<String,Object>();
|
||||||
PageData pd =this.getPageData();
|
PageData pd =this.getPageData();
|
||||||
map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls");
|
map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls");
|
||||||
|
if(!ObjectUtils.isEmpty(map)){
|
||||||
|
map = new HashMap<String,Object>();
|
||||||
|
}
|
||||||
map.put("result", "success");
|
map.put("result", "success");
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
@ -67,6 +71,9 @@ public class PlatformvideomanagementController extends BaseController {
|
||||||
Map<String,Object> map = new HashMap<String,Object>();
|
Map<String,Object> map = new HashMap<String,Object>();
|
||||||
PageData pd =this.getPageData();
|
PageData pd =this.getPageData();
|
||||||
map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"rtsp");
|
map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"rtsp");
|
||||||
|
if(!ObjectUtils.isEmpty(map)){
|
||||||
|
map = new HashMap<String,Object>();
|
||||||
|
}
|
||||||
map.put("result", "success");
|
map.put("result", "success");
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
@ -80,6 +87,9 @@ public class PlatformvideomanagementController extends BaseController {
|
||||||
Map<String,Object> map = new HashMap<String,Object>();
|
Map<String,Object> map = new HashMap<String,Object>();
|
||||||
PageData pd =this.getPageData();
|
PageData pd =this.getPageData();
|
||||||
map = HKUtil.cameraSearch(pd);
|
map = HKUtil.cameraSearch(pd);
|
||||||
|
if(!ObjectUtils.isEmpty(map)){
|
||||||
|
map = new HashMap<String,Object>();
|
||||||
|
}
|
||||||
map.put("result", "success");
|
map.put("result", "success");
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue