Commit 4af3632c authored by chenzhao's avatar chenzhao

Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

parents 438997a8 0e3f9bd4
package com.yeejoin.equipmanage.dto;
import lombok.Data;
@Data
public class CountDto {
private String bizOrgCode;
private Integer num;
}
...@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.equipmanage.common.entity.Video; import com.yeejoin.equipmanage.common.entity.Video;
import com.yeejoin.equipmanage.common.entity.vo.*; import com.yeejoin.equipmanage.common.entity.vo.*;
import com.yeejoin.equipmanage.dto.CountDto;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @author ZeHua Li * @author ZeHua Li
...@@ -90,4 +92,6 @@ public interface VideoMapper extends BaseMapper<Video> { ...@@ -90,4 +92,6 @@ public interface VideoMapper extends BaseMapper<Video> {
String getParentSourceIds(String childrenId); String getParentSourceIds(String childrenId);
List<CountDto> getVideoCountMapList();
} }
...@@ -9,6 +9,7 @@ import com.yeejoin.equipmanage.common.entity.dto.VideoSaveDto; ...@@ -9,6 +9,7 @@ import com.yeejoin.equipmanage.common.entity.dto.VideoSaveDto;
import com.yeejoin.equipmanage.common.entity.vo.*; import com.yeejoin.equipmanage.common.entity.vo.*;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* @author ZeHua Li * @author ZeHua Li
...@@ -79,4 +80,11 @@ public interface IVideoService extends IService<Video> { ...@@ -79,4 +80,11 @@ public interface IVideoService extends IService<Video> {
String getVideoUrl(String videoId, String presetIndex, String defaultUrl, String code); String getVideoUrl(String videoId, String presetIndex, String defaultUrl, String code);
List<OrgMenuDto> companyTreeByUserAndType(String type); List<OrgMenuDto> companyTreeByUserAndType(String type);
/**
* 获取机构下的监控数量
* key:机构编码 value:数量
* @return
*/
Map<String, Long> getVideoCountMap();
} }
...@@ -15,6 +15,7 @@ import com.yeejoin.equipmanage.common.enums.IndustryEnum; ...@@ -15,6 +15,7 @@ import com.yeejoin.equipmanage.common.enums.IndustryEnum;
import com.yeejoin.equipmanage.common.enums.VideoTypeEnum; import com.yeejoin.equipmanage.common.enums.VideoTypeEnum;
import com.yeejoin.equipmanage.common.utils.HttpContentTypeUtil; import com.yeejoin.equipmanage.common.utils.HttpContentTypeUtil;
import com.yeejoin.equipmanage.common.utils.StringUtil; import com.yeejoin.equipmanage.common.utils.StringUtil;
import com.yeejoin.equipmanage.dto.CountDto;
import com.yeejoin.equipmanage.fegin.VideoFeignClient; import com.yeejoin.equipmanage.fegin.VideoFeignClient;
import com.yeejoin.equipmanage.mapper.VideoMapper; import com.yeejoin.equipmanage.mapper.VideoMapper;
import com.yeejoin.equipmanage.service.*; import com.yeejoin.equipmanage.service.*;
...@@ -621,4 +622,14 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements ...@@ -621,4 +622,14 @@ public class VideoServiceImpl extends ServiceImpl<VideoMapper, Video> implements
return ""; return "";
} }
@Override
public Map<String, Long> getVideoCountMap() {
List<CountDto> videoCountMapList = videoMapper.getVideoCountMapList();
Map<String, Long> videoMap = new HashMap<>();
videoCountMapList.forEach(item -> {
videoMap.put(item.getBizOrgCode(), item.getNum().longValue());
});
return videoMap;
}
} }
...@@ -393,4 +393,10 @@ ...@@ -393,4 +393,10 @@
<select id="getParentSourceIds" resultType="java.lang.String"> <select id="getParentSourceIds" resultType="java.lang.String">
select getBuildingParentIds(#{childrenId}) select getBuildingParentIds(#{childrenId})
</select> </select>
<select id="getVideoCountMapList" resultType="com.yeejoin.equipmanage.dto.CountDto">
select biz_org_code as bizOrgCode, count(biz_org_code) as num
from wl_video
group by biz_org_code
</select>
</mapper> </mapper>
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