admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

萤石设备逻辑修改

Browse Source
This commit is contained in:
pengjie 2023-04-03 09:05:14 +08:00
parent cc565109bf
commit a08735b9b2
1 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java
View File

@ -77,16 +77,18 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
throw new OpenAlertException(MessageUtil.get("serialNumberExistErr")); throw new OpenAlertException(MessageUtil.get("serialNumberExistErr"));
} }
} }
if (projectVideoConfig.getVideoType() == 1) { // TODO 此处直接添加成功,暂时不需要添加萤石设备 用户使用此功能前需要先在萤石添加好自己需要的设备,之后在智慧工地平台添加
String accessToken = YsVideoUtil.getToken(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret()); // if (projectVideoConfig.getVideoType() == 1) {
Map<String, Object> temp = YsVideoUtil.getVideoInfo(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret(), videoItem.getSerialNumber(), accessToken); // String accessToken = YsVideoUtil.getToken(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret());
if (temp == null || temp.size() == 0) { // // 获取用户下的设备信息,如果不存在,账户下添加
boolean falg = YsVideoUtil.addVideo(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret(), videoItem.getSerialNumber(), videoItem.getVerificationCode(), accessToken); // Map<String, Object> temp = YsVideoUtil.getVideoInfo(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret(), videoItem.getSerialNumber(), accessToken);
if (!falg) { // if (temp == null || temp.size() == 0) {
throw new OpenAlertException(MessageUtil.get("devAddErr")); // boolean falg = YsVideoUtil.addVideo(projectVideoConfig.getAppId(), projectVideoConfig.getAppSecret(), videoItem.getSerialNumber(), videoItem.getVerificationCode(), accessToken);
} // if (!falg) {
} // throw new OpenAlertException(MessageUtil.get("devAddErr"));
} // }
// }
// }
videoItem.setCreateTime(new Date()); videoItem.setCreateTime(new Date());
videoItemMapper.insert(videoItem); videoItemMapper.insert(videoItem);
} }
@ -136,7 +138,8 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
List<EntityMap> list = null; List<EntityMap> list = null;
if (projectVideoConfig != null) { if (projectVideoConfig != null) {
list = videoItemMapper.selectVideoItemListByVideoId(projectVideoConfig.getId(), MapUtils.getString(map, "groupId")); list = videoItemMapper.selectVideoItemListByVideoId(projectVideoConfig.getId(), MapUtils.getString(map, "groupId"));
list = getVideoOtherData(projectVideoConfig, list); // TODO 此处用户直接在智慧工地云平台添加设备,设备需要手动在萤石云添加好完成
// list = getVideoOtherData(projectVideoConfig, list);
} }
return list; return list;
} }
@ -300,8 +303,17 @@ public class VideoItemServiceImpl extends ServiceImpl<VideoItemMapper, VideoItem
@Override @Override
public Map<String, Object> selectProjectVideoList(Map<String, Object> map) { public Map<String, Object> selectProjectVideoList(Map<String, Object> map) {
// 如果config type = 1 获取token
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();
List<EntityMap> videoList = videoItemMapper.selectProjectVideoList(map); List<EntityMap> videoList = videoItemMapper.selectProjectVideoList(map);
if (videoList.size() > 0) {
String token = YsVideoUtil.getToken(MapUtils.getString(videoList.get(0), "appId"), MapUtils.getString(videoList.get(0), "appSecret"));
for (EntityMap entityMap : videoList) {
entityMap.put("token", token);
entityMap.put("url", "ezopen://open.ys7.com/" + MapUtils.getString(entityMap, "serialNumber") + "/" +
MapUtils.getString(entityMap, "verificationCode") + ".hd.live");
}
}
List<EntityMap> groupList = videoGroupMapper.selectVideoGroupList(map); List<EntityMap> groupList = videoGroupMapper.selectVideoGroupList(map);
if (groupList != null && groupList.size() > 0) { if (groupList != null && groupList.size() > 0) {
List<EntityMap> tempList = new ArrayList<>(); List<EntityMap> tempList = new ArrayList<>();