Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
H
hxwza
Project
Project
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
Graph
比较
统计图
议题
0
议题
0
列表
看板
标记
Milestones
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
注册表
注册表
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
svn
hxwza
Commits
19231dd8
提交
19231dd8
authored
10月 14, 2020
作者:
liupengfei
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
--no commit message
上级
db1053ab
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
75 行增加
和
23 行删除
+75
-23
ResourceLibraryController.java
...controller/resourcelibrary/ResourceLibraryController.java
+44
-14
AudioLibrarySerivceImpl.java
...urce/bg/service/audiolibrary/AudioLibrarySerivceImpl.java
+2
-2
AudioLibraryService.java
...resource/bg/service/audiolibrary/AudioLibraryService.java
+1
-1
EbookService.java
...java/com/zrqx/resource/bg/service/ebook/EbookService.java
+1
-1
EbookServiceImpl.java
.../com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java
+2
-2
VideoLibrarySerivceImpl.java
...urce/bg/service/videolibrary/VideoLibrarySerivceImpl.java
+2
-2
VideoLibraryService.java
...resource/bg/service/videolibrary/VideoLibraryService.java
+1
-1
StatisticsResourceExportVO.java
...qx/resource/commons/vo/bg/StatisticsResourceExportVO.java
+22
-0
没有找到文件。
app/resource/src/main/java/com/zrqx/resource/bg/controller/resourcelibrary/ResourceLibraryController.java
浏览文件 @
19231dd8
package
com
.
zrqx
.
resource
.
bg
.
controller
.
resourcelibrary
;
package
com
.
zrqx
.
resource
.
bg
.
controller
.
resourcelibrary
;
import
java.io.IOException
;
import
java.security.NoSuchAlgorithmException
;
import
java.text.SimpleDateFormat
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.Date
;
...
@@ -10,8 +7,6 @@ import java.util.HashMap;
...
@@ -10,8 +7,6 @@ import java.util.HashMap;
import
java.util.LinkedHashMap
;
import
java.util.LinkedHashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.concurrent.ExecutorService
;
import
java.util.concurrent.Executors
;
import
java.util.regex.Matcher
;
import
java.util.regex.Matcher
;
import
java.util.regex.Pattern
;
import
java.util.regex.Pattern
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -90,7 +85,6 @@ import com.zrqx.resource.commons.model.projectlibrary.ProjectModelResource;
...
@@ -90,7 +85,6 @@ import com.zrqx.resource.commons.model.projectlibrary.ProjectModelResource;
import
com.zrqx.resource.commons.model.recommend.RecommendResource
;
import
com.zrqx.resource.commons.model.recommend.RecommendResource
;
import
com.zrqx.resource.commons.model.resourcerelation.ResourceRelation
;
import
com.zrqx.resource.commons.model.resourcerelation.ResourceRelation
;
import
com.zrqx.resource.commons.model.videolibrary.VideoLibraryDiyType
;
import
com.zrqx.resource.commons.model.videolibrary.VideoLibraryDiyType
;
import
com.zrqx.resource.commons.solr.SolrAdapter
;
import
com.zrqx.resource.commons.solr.SolrManage
;
import
com.zrqx.resource.commons.solr.SolrManage
;
import
com.zrqx.resource.commons.vo.bg.ResourceRelationVo
;
import
com.zrqx.resource.commons.vo.bg.ResourceRelationVo
;
import
com.zrqx.resource.commons.vo.bg.StatisticsResourceVO
;
import
com.zrqx.resource.commons.vo.bg.StatisticsResourceVO
;
...
@@ -1103,20 +1097,56 @@ public class ResourceLibraryController {
...
@@ -1103,20 +1097,56 @@ public class ResourceLibraryController {
@ApiOperation
(
value
=
"统计资源详情"
,
notes
=
"统计资源详情"
)
@ApiOperation
(
value
=
"统计资源详情"
,
notes
=
"统计资源详情"
)
@GetMapping
(
value
=
"/get/statistics/resource"
)
@GetMapping
(
value
=
"/get/statistics/resource"
)
public
CallBack
<
List
<
StatisticsResourceVO
>>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
)
{
public
CallBack
<
PageInfo
<
StatisticsResourceVO
>>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
)
{
List
<
StatisticsResourceVO
>
list
=
new
ArrayList
<
StatisticsResourceVO
>();
//图书库列表查询
//图书库列表查询
if
(
form
.
getResourceType
().
equals
(
AllResourceTypeEnum
.
BOOK
.
getCode
())){
if
(
form
.
getResourceType
().
equals
(
AllResourceTypeEnum
.
BOOK
.
getCode
())){
list
=
ebookservice
.
getStatisticsResource
(
form
,
pageParam
);
return
CallBack
.
success
(
ebookservice
.
getStatisticsResource
(
form
,
pageParam
)
);
}
}
//视频库列表查询
//视频库列表查询
if
(
form
.
getResourceType
().
equals
(
AllResourceTypeEnum
.
VIDEO
.
getCode
())){
else
if
(
form
.
getResourceType
().
equals
(
AllResourceTypeEnum
.
VIDEO
.
getCode
())){
list
=
videoLibraryService
.
getStatisticsResource
(
form
,
pageParam
);
return
CallBack
.
success
(
videoLibraryService
.
getStatisticsResource
(
form
,
pageParam
)
);
}
}
//音频库列表查询
//音频库列表查询
if
(
form
.
getResourceType
().
equals
(
AllResourceTypeEnum
.
AUDIO
.
getCode
())){
else
if
(
form
.
getResourceType
().
equals
(
AllResourceTypeEnum
.
AUDIO
.
getCode
())){
list
=
audioLibraryService
.
getStatisticsResource
(
form
,
pageParam
);
return
CallBack
.
success
(
audioLibraryService
.
getStatisticsResource
(
form
,
pageParam
)
);
}
}
return
CallBack
.
success
(
list
);
return
CallBack
.
success
();
}
}
/*
* @ApiOperation(value = "导出统计资源详情", notes = "导出统计资源详情")
*
* @GetMapping(value = "/export/statistics/resource") public CallBack<?>
* exportStatisticsResource(SearchForm form,HttpServletRequest request,
* HttpServletResponse response) { List<StatisticsResourceVO> list = new
* ArrayList<StatisticsResourceVO>(); //图书库列表查询
* if(form.getResourceType().equals(AllResourceTypeEnum.BOOK.getCode())){ list =
* ebookservice.getStatisticsResource(form, pageParam); } //视频库列表查询
* if(form.getResourceType().equals(AllResourceTypeEnum.VIDEO.getCode())){ list
* = videoLibraryService.getStatisticsResource(form, pageParam); } //音频库列表查询
* if(form.getResourceType().equals(AllResourceTypeEnum.AUDIO.getCode())){ list
* = audioLibraryService.getStatisticsResource(form, pageParam); } return
* CallBack.success(list); }
*
* @ApiOperation(value = "导出数据", notes = "导出数据")
*
* @GetMapping(value ="/export") public CallBack<?>
* exportMemberList(QueryLoginLogForm form,HttpServletRequest request,
* HttpServletResponse response) { PageHelper.orderBy("uploadTime desc");
* Example ex = llService.createExample(); Criteria cr = ex.createCriteria(); if
* (form.getLoginAccount() != null) { cr.andLike("loginAccount",
* "%"+form.getLoginAccount()+"%"); } if
* (StringUtils.isNotBlank(form.getBeginTime())) {
* cr.andGreaterThanOrEqualTo("uploadTime", form.getBeginTime()+" 00:00:00"); }
* if (StringUtils.isNotBlank(form.getEndTime())) {
* cr.andLessThanOrEqualTo("uploadTime", form.getEndTime()+" 23:59:59"); }
* List<LoginLog> loginLogList = llService.selectByExample(ex);
* loginLogList.forEach(f -> { if(f.getChannel() != null) {
* f.setChannel_zh(ChannelEnum.getName(f.getChannel())); } });
* List<StatisticsResourceExportVO> list = BeanUtils.copyList(loginLogList,
* StatisticsResourceExportVO.class); try {
* ExcelUtil.getInstance().exportExcel(list, StatisticsResourceExportVO.class,
* "用户登录信息.xls", response, request); } catch (Exception e) { return
* CallBack.fail(e.getMessage()); } return CallBack.success(); }
*/
}
}
app/resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioLibrarySerivceImpl.java
浏览文件 @
19231dd8
...
@@ -312,9 +312,9 @@ public class AudioLibrarySerivceImpl extends BaseServiceImpl<AudioLibrary,String
...
@@ -312,9 +312,9 @@ public class AudioLibrarySerivceImpl extends BaseServiceImpl<AudioLibrary,String
* 统计音频详情
* 统计音频详情
*/
*/
@Override
@Override
public
List
<
StatisticsResourceVO
>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
)
{
public
PageInfo
<
StatisticsResourceVO
>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
)
{
startPage
(
pageParam
);
startPage
(
pageParam
);
List
<
StatisticsResourceVO
>
list
=
mapper
.
getStatisticsResource
(
form
);
List
<
StatisticsResourceVO
>
list
=
mapper
.
getStatisticsResource
(
form
);
return
list
;
return
new
PageInfo
<
StatisticsResourceVO
>(
list
)
;
}
}
}
}
app/resource/src/main/java/com/zrqx/resource/bg/service/audiolibrary/AudioLibraryService.java
浏览文件 @
19231dd8
...
@@ -75,5 +75,5 @@ public interface AudioLibraryService extends BaseService<AudioLibrary,String>{
...
@@ -75,5 +75,5 @@ public interface AudioLibraryService extends BaseService<AudioLibrary,String>{
* @param pageParam
* @param pageParam
* @return
* @return
*/
*/
List
<
StatisticsResourceVO
>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
);
PageInfo
<
StatisticsResourceVO
>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
);
}
}
app/resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookService.java
浏览文件 @
19231dd8
...
@@ -85,6 +85,6 @@ public interface EbookService extends BaseService<Ebook, String>{
...
@@ -85,6 +85,6 @@ public interface EbookService extends BaseService<Ebook, String>{
/*
/*
* 查询统计资源详情
* 查询统计资源详情
*/
*/
List
<
StatisticsResourceVO
>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
);
PageInfo
<
StatisticsResourceVO
>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
);
}
}
app/resource/src/main/java/com/zrqx/resource/bg/service/ebook/EbookServiceImpl.java
浏览文件 @
19231dd8
...
@@ -460,9 +460,9 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
...
@@ -460,9 +460,9 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
}
}
@Override
@Override
public
List
<
StatisticsResourceVO
>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
)
{
public
PageInfo
<
StatisticsResourceVO
>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
)
{
startPage
(
pageParam
);
startPage
(
pageParam
);
List
<
StatisticsResourceVO
>
list
=
ebookMapper
.
getStatisticsResource
(
form
);
List
<
StatisticsResourceVO
>
list
=
ebookMapper
.
getStatisticsResource
(
form
);
return
list
;
return
new
PageInfo
<
StatisticsResourceVO
>(
list
)
;
}
}
}
}
app/resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibrarySerivceImpl.java
浏览文件 @
19231dd8
...
@@ -374,9 +374,9 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
...
@@ -374,9 +374,9 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
* 统计音频详情
* 统计音频详情
*/
*/
@Override
@Override
public
List
<
StatisticsResourceVO
>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
)
{
public
PageInfo
<
StatisticsResourceVO
>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
)
{
startPage
(
pageParam
);
startPage
(
pageParam
);
List
<
StatisticsResourceVO
>
list
=
mapper
.
getStatisticsResource
(
form
);
List
<
StatisticsResourceVO
>
list
=
mapper
.
getStatisticsResource
(
form
);
return
list
;
return
new
PageInfo
<
StatisticsResourceVO
>(
list
)
;
}
}
}
}
app/resource/src/main/java/com/zrqx/resource/bg/service/videolibrary/VideoLibraryService.java
浏览文件 @
19231dd8
...
@@ -82,6 +82,6 @@ public interface VideoLibraryService extends BaseService<VideoLibrary,String>{
...
@@ -82,6 +82,6 @@ public interface VideoLibraryService extends BaseService<VideoLibrary,String>{
* @param pageParam
* @param pageParam
* @return
* @return
*/
*/
List
<
StatisticsResourceVO
>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
);
PageInfo
<
StatisticsResourceVO
>
getStatisticsResource
(
SearchForm
form
,
PageParam
pageParam
);
}
}
app/resource/src/main/java/com/zrqx/resource/commons/vo/bg/StatisticsResourceExportVO.java
0 → 100644
浏览文件 @
19231dd8
package
com
.
zrqx
.
resource
.
commons
.
vo
.
bg
;
import
java.util.Date
;
import
lombok.Data
;
import
com.zrqx.core.util.excelutil.ExcelResources
;
@Data
public
class
StatisticsResourceExportVO
{
@ExcelResources
(
title
=
"会员账号"
,
order
=
1
)
private
String
loginAccount
;
@ExcelResources
(
title
=
"登录ip"
,
order
=
2
)
private
String
ip
;
@ExcelResources
(
title
=
"登录时间"
,
order
=
3
)
private
Date
uploadTime
;
@ExcelResources
(
title
=
"登录方式"
,
order
=
4
)
private
String
channel_zh
;
@ExcelResources
(
title
=
"描述"
,
order
=
5
)
private
String
synopsis
;
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论