--no commit message

app/resource/src/main/java/com/zrqx/resource/bg/controller/resourcelibrary/ResourceLibraryController.java

 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.Arrays;
 import java.util.Date;
@@ -10,8 +7,6 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -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.resourcerelation.ResourceRelation;
 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.vo.bg.ResourceRelationVo;
 import com.zrqx.resource.commons.vo.bg.StatisticsResourceVO;
@@ -1103,20 +1097,56 @@ public class ResourceLibraryController {
 	
 	@ApiOperation(value = "统计资源详情", notes = "统计资源详情")
 	@GetMapping(value = "/get/statistics/resource")
-	public CallBack<List<StatisticsResourceVO>> getStatisticsResource(SearchForm form,PageParam pageParam) {
-		List<StatisticsResourceVO> list = new ArrayList<StatisticsResourceVO>();
+	public CallBack<PageInfo<StatisticsResourceVO>> getStatisticsResource(SearchForm form,PageParam pageParam) {
 		//图书库列表查询
 		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())){
-			list = videoLibraryService.getStatisticsResource(form, pageParam);
+		else if(form.getResourceType().equals(AllResourceTypeEnum.VIDEO.getCode())){
+			return CallBack.success(videoLibraryService.getStatisticsResource(form, pageParam));
 		}
 		//音频库列表查询
-		if(form.getResourceType().equals(AllResourceTypeEnum.AUDIO.getCode())){
-			list = audioLibraryService.getStatisticsResource(form, pageParam);
+		else if(form.getResourceType().equals(AllResourceTypeEnum.AUDIO.getCode())){
+			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

@@ -312,9 +312,9 @@ public class AudioLibrarySerivceImpl extends BaseServiceImpl<AudioLibrary,String
 	 * 统计音频详情
 	 */
 	@Override
-	public List<StatisticsResourceVO> getStatisticsResource(SearchForm form, PageParam pageParam) {
+	public PageInfo<StatisticsResourceVO> getStatisticsResource(SearchForm form, PageParam pageParam) {
 		startPage(pageParam);
 		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

@@ -75,5 +75,5 @@ public interface AudioLibraryService extends BaseService<AudioLibrary,String>{
 	 * @param pageParam
 	 * @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

@@ -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

@@ -460,9 +460,9 @@ public class EbookServiceImpl extends BaseServiceImpl<Ebook, String> implements
 	}
 
 	@Override
-	public List<StatisticsResourceVO> getStatisticsResource(SearchForm form, PageParam pageParam) {
+	public PageInfo<StatisticsResourceVO> getStatisticsResource(SearchForm form, PageParam pageParam) {
 		startPage(pageParam);
 		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

@@ -374,9 +374,9 @@ public class VideoLibrarySerivceImpl extends BaseServiceImpl<VideoLibrary,String
 	 * 统计音频详情
 	 */
 	@Override
-	public List<StatisticsResourceVO> getStatisticsResource(SearchForm form, PageParam pageParam) {
+	public PageInfo<StatisticsResourceVO> getStatisticsResource(SearchForm form, PageParam pageParam) {
 		startPage(pageParam);
 		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

@@ -82,6 +82,6 @@ public interface VideoLibraryService extends BaseService<VideoLibrary,String>{
 	 * @param pageParam
 	 * @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

+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;
+}