Commit a2bf4b8f authored by suhuiguang's avatar suhuiguang

1.消防视频数据筛选

parent 861ad2eb
......@@ -17,7 +17,7 @@ import java.util.List;
*/
@Mapper
public interface VideoMapper extends BaseMapper<Video> {
Page<PageVideoVO> pageVideo(@Param("page") IPage<Video> page, @Param("video") Video video, @Param("list") List<String> bizOrgCodeList);
Page<PageVideoVO> pageVideo(@Param("page") IPage<Video> page, @Param("video") Video video);
Page<BuildingVideoVO> pageBuildingVideo(@Param("page") Page page, @Param("dto") BuildingVideoListVO dto);
......
......@@ -204,16 +204,8 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
@Override
public Page<PageVideoVO> pageVideo(VideoDTO videoDTO) {
Video video = videoDTO.getVideo();
String orgTypes = videoDTO.getOrgTypes();
String bizOrgCode = video.getBizOrgCode();
List<String> bizOrgCodeList = new ArrayList<>();
if (!StringUtils.isNotBlank(bizOrgCode)) {
List<OrgUsrDto> list = jcsRemoteService.getCompanyDeptListWithAuth(authKey, orgTypes);
if (!CollectionUtils.isEmpty(list)) {
list.stream().filter(o -> StringUtils.isNotBlank(o.getBizOrgCode())).forEach(x -> bizOrgCodeList.add(x.getBizOrgCode()));
}
}
return this.baseMapper.pageVideo(videoDTO.getPage(), video, bizOrgCodeList);
return this.baseMapper.pageVideo(videoDTO.getPage(), video);
}
@Override
......
......@@ -50,12 +50,6 @@
<if test="video!=null and video.bizOrgCode!=null and video.bizOrgCode!=''">
and wlv.biz_org_code LIKE CONCAT(#{video.bizOrgCode}, '%')
</if>
<if test="list != null and list.size() >0">
and wlv.biz_org_code IN
<foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
group by wlv.id
order by wlv.create_date desc
</select>
......
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