Commit ebb4c768 authored by tangwei's avatar tangwei

增加点位视频绑定,删除接口

parent 62591c56
...@@ -19,7 +19,7 @@ public class VideoOnEquipmentSpecificVo { ...@@ -19,7 +19,7 @@ public class VideoOnEquipmentSpecificVo {
/** /**
* 设备ID * 设备ID
*/ */
private List<Long> equipmentSpecificId; private Long equipmentSpecificId;
/** /**
* 摄像头Id集合 * 摄像头Id集合
......
...@@ -347,6 +347,26 @@ public class EquipmentSpecificController extends AbstractBaseController { ...@@ -347,6 +347,26 @@ public class EquipmentSpecificController extends AbstractBaseController {
return CommonResponseUtil.success(equipmentSpecificSerivce.delVideoOnEquipmentSpecific(equipmentSpecificId,videoId)); return CommonResponseUtil.success(equipmentSpecificSerivce.delVideoOnEquipmentSpecific(equipmentSpecificId,videoId));
} }
@RequestMapping(value = "/delVideoOnEquipment/jb", method = RequestMethod.POST)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "摄像头解绑设备", notes = "摄像头绑定设备")
public ResponseModel delVideoOnEquipmentjb( @RequestBody List<String> ids) {
return CommonResponseUtil.success(equipmentSpecificSerivce.delVideoOnEquipmentjb( ids));
}
@RequestMapping(value = "/videoOnEquipmentSpecific/bj", method = RequestMethod.POST)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "摄像头绑定设备", notes = "摄像头绑定设备")
public ResponseModel videoOnEquipmentSpecificbj(@RequestBody Map<String,List<String>> date ) {
return CommonResponseUtil.success(equipmentSpecificSerivce.videoOnEquipmentSpecificbj(date));
}
@TycloudOperation(ApiLevel = UserType.AGENCY) @TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{buildingId}/list") @GetMapping(value = "/{buildingId}/list")
@ApiOperation(httpMethod = "GET", value = "查询指定建筑下的装备列表", notes = "查询指定建筑下的装备列表") @ApiOperation(httpMethod = "GET", value = "查询指定建筑下的装备列表", notes = "查询指定建筑下的装备列表")
......
...@@ -219,7 +219,8 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> { ...@@ -219,7 +219,8 @@ public interface IEquipmentSpecificSerivce extends IService<EquipmentSpecific> {
*/ */
Boolean videoOnEquipmentSpecific(VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo); Boolean videoOnEquipmentSpecific(VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo);
Boolean delVideoOnEquipmentSpecific(Long equipmentSpecificId, Long videoId); Boolean delVideoOnEquipmentSpecific(Long equipmentSpecificId, Long videoId);
Boolean delVideoOnEquipmentjb(List<String> ids);
Boolean videoOnEquipmentSpecificbj( Map<String,List<String>> date);
/** /**
* 根据装备分类code获取装备列表 * 根据装备分类code获取装备列表
* @param code 装备分类逗号隔开 * @param code 装备分类逗号隔开
......
...@@ -1712,10 +1712,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -1712,10 +1712,10 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
@Override @Override
public Boolean videoOnEquipmentSpecific(VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo) { public Boolean videoOnEquipmentSpecific(VideoOnEquipmentSpecificVo videoOnEquipmentSpecificVo) {
List<Long> equipmentSpecificIds = videoOnEquipmentSpecificVo.getEquipmentSpecificId(); Long equipmentSpecificId = videoOnEquipmentSpecificVo.getEquipmentSpecificId();
List<Long> videoIdList = videoOnEquipmentSpecificVo.getVideoIdList(); List<Long> videoIdList = videoOnEquipmentSpecificVo.getVideoIdList();
if (equipmentSpecificIds != null) { if (equipmentSpecificId != null) {
for (Long equipmentSpecificId : equipmentSpecificIds) {
EquipmentSpecific equipmentSpecific = this.baseMapper.selectById(equipmentSpecificId); EquipmentSpecific equipmentSpecific = this.baseMapper.selectById(equipmentSpecificId);
if (!ObjectUtils.isEmpty(equipmentSpecific)) { if (!ObjectUtils.isEmpty(equipmentSpecific)) {
QueryWrapper<VideoEquipmentSpecific> queryWrapper = new QueryWrapper<>(); QueryWrapper<VideoEquipmentSpecific> queryWrapper = new QueryWrapper<>();
...@@ -1737,6 +1737,46 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -1737,6 +1737,46 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
} else { } else {
throw new RuntimeException("未获取到此设备!"); throw new RuntimeException("未获取到此设备!");
} }
} else {
throw new RuntimeException("设备ID为空!");
}
}
@Override
public Boolean videoOnEquipmentSpecificbj(Map<String,List<String>> date) {
List<String> equipmentSpecificIds = date.get("eqid");
List<String> videoIdList = date.get("videoid");
if (equipmentSpecificIds != null) {
for (String equipmentSpecificId : equipmentSpecificIds) {
EquipmentSpecific equipmentSpecific = this.baseMapper.selectById(equipmentSpecificId);
if (!ObjectUtils.isEmpty(equipmentSpecific)) {
QueryWrapper<VideoEquipmentSpecific> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("equipment_specific_id", equipmentSpecificId);
List<VideoEquipmentSpecific> list = videoEquipmentSpecificService.getBaseMapper().selectList(queryWrapper);
if(list!=null&&list.size()>0){
for (VideoEquipmentSpecific videoEquipmentSpecific : list) {
if(videoIdList.contains(String.valueOf(videoEquipmentSpecific.getVideoId()))){
videoIdList.remove(String.valueOf(videoEquipmentSpecific.getVideoId()));
}
}
}
List<VideoEquipmentSpecific> videoSpecificList1 = new ArrayList<>();
videoIdList.parallelStream().forEach(x -> {
VideoEquipmentSpecific videoEquipmentSpecific = new VideoEquipmentSpecific();
videoEquipmentSpecific.setVideoId(Long.valueOf(x));
videoEquipmentSpecific.setEquipmentSpecificId(Long.valueOf(equipmentSpecificId));
videoSpecificList1.add(videoEquipmentSpecific);
});
videoEquipmentSpecificService.saveBatch(videoSpecificList1);
return Boolean.TRUE;
} else {
throw new RuntimeException("未获取到此设备!");
}
} }
} else { } else {
throw new RuntimeException("设备ID为空!"); throw new RuntimeException("设备ID为空!");
...@@ -1744,6 +1784,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -1744,6 +1784,9 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
return Boolean.TRUE; return Boolean.TRUE;
} }
@Override @Override
public Boolean delVideoOnEquipmentSpecific(Long equipmentSpecificId, Long videoId) { public Boolean delVideoOnEquipmentSpecific(Long equipmentSpecificId, Long videoId) {
QueryWrapper<VideoEquipmentSpecific> queryWrapper = new QueryWrapper<>(); QueryWrapper<VideoEquipmentSpecific> queryWrapper = new QueryWrapper<>();
...@@ -1753,6 +1796,15 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM ...@@ -1753,6 +1796,15 @@ public class EquipmentSpecificSerivceImpl extends ServiceImpl<EquipmentSpecificM
return true; return true;
} }
@Override
public Boolean delVideoOnEquipmentjb(List<String> ids) {
QueryWrapper<VideoEquipmentSpecific> queryWrapper = new QueryWrapper<>();
queryWrapper.in("equipment_specific_id", ids);
videoEquipmentSpecificService.remove(queryWrapper);
return true;
}
private Boolean bingEquipmentRelationshipToVideo(List<Long> videoIdList, Long equipmentSpecificId) { private Boolean bingEquipmentRelationshipToVideo(List<Long> videoIdList, Long equipmentSpecificId) {
List<VideoEquipmentSpecific> videoSpecificList = new ArrayList<>(); List<VideoEquipmentSpecific> videoSpecificList = new ArrayList<>();
videoIdList.parallelStream().forEach(x -> { videoIdList.parallelStream().forEach(x -> {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment