--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/QueryStatisticsForm.java

+package com.zrqx.core.form.resource.bg;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+@Data
+@ApiModel(value="QueryStatisticsForm",description="添加自定义分类")
+public class QueryStatisticsForm {
+	@ApiModelProperty(value="开始")
+	private String beginTime;
+	@ApiModelProperty(value="结束")
+	private String endTime;
+}

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

@@ -24,6 +24,7 @@ import com.zrqx.core.exception.ParameterValidateException;
 import com.zrqx.core.form.resource.bg.ClassifyRelationForm;
 import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
 import com.zrqx.core.form.resource.bg.QueryResourceRelationForm;
+import com.zrqx.core.form.resource.bg.QueryStatisticsForm;
 import com.zrqx.core.form.resource.bg.SaveResourceRelationForm;
 import com.zrqx.core.form.resource.bg.ebook.UpdateEbookRelationForm;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibraryDiyType;
@@ -193,12 +194,12 @@ public class ResourceLibraryController {
 	}
 	@ApiOperation(value = "获取最近7天杂志、文章阅读量", notes = "获取最近7天杂志、文章阅读量")
 	@GetMapping(value = ResourceRequestPath.STATISTICS)
-	public CallBack<BookStatisticsVo> getStatistics() {	
+	public CallBack<BookStatisticsVo> getStatistics(QueryStatisticsForm form) {	
 		BookStatisticsVo vo = new BookStatisticsVo();
 		//杂志最近7天阅读量
-		List<EbookListStatisticsVO> bookList=bookservice.queryBookReadingVolume();
+		List<EbookListStatisticsVO> bookList=bookservice.queryBookReadingVolume(form);
 		//文章最近7天阅读量
-		List<ArticleLibraryListStatisticsVO> artList=articleLibraryService.queryArticleReadingVolume();
+		List<ArticleLibraryListStatisticsVO> artList=articleLibraryService.queryArticleReadingVolume(form);
 		vo.setBook(bookList);
 		vo.setArticleLibrary(artList);
 		return CallBack.success(vo);

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/articlelibrary/ArticleLibraryMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
+import com.zrqx.core.form.resource.bg.QueryStatisticsForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.QueryArticleLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
@@ -66,9 +67,16 @@ public interface ArticleLibraryMapper extends BaseMapper<ArticleLibrary> {
 	 * @date: 2019年9月20日 上午10:39:57
 	 */
 	@Select("<script>" 
-			+ "select id,name,DATE_FORMAT(uploadTime,'%Y-%m-%d') uploadTime,browseNum from res_article_library  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt; date(uploadTime) ORDER BY uploadTime desc "
-		    + "</script>")
-	List<ArticleLibraryListStatisticsVO> queryArticleReadingVolume();
+			+ "select id,name,DATE_FORMAT(uploadTime,'%Y-%m-%d') uploadTime,browseNum from res_article_library  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt; date(uploadTime) "
+			   + "<if test = '" + NOTBLANK + "(form.beginTime)'>"  
+			    + "and uploadTime &gt;= concat(#{form.beginTime}, ' 00:00:00' )"
+			    + "</if>" 
+			    + "<if test = '" + NOTBLANK + "(form.endTime)'>"  
+			    + "and uploadTime &lt;= concat(#{form.endTime}, ' 23:59:59')"
+			    + "</if>"
+			    + " ORDER BY uploadTime desc"
+			+ "</script>")
+	List<ArticleLibraryListStatisticsVO> queryArticleReadingVolume(@Param("form")QueryStatisticsForm form);
 
 	
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/ebook/BookMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
+import com.zrqx.core.form.resource.bg.QueryStatisticsForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.ebook.Book;
 import com.zrqx.core.vo.resource.ResourceRelationListVo;
@@ -26,8 +27,15 @@ public interface BookMapper extends BaseMapper<Book> {
 		    + "</script>")
 	List<ResourceRelationListVo> queryByTileAndDiyType(@Param("form")QueryResourceForPoPForm form);
 	@Select("<script>" 
-			+"select id,name,DATE_FORMAT(uploadTime,'%Y-%m-%d') uploadTime,browseNum from res_book  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt; date(uploadTime) ORDER BY uploadTime desc"
-		    + "</script>")
-	List<EbookListStatisticsVO> queryBookReadingVolume();
+			+"select id,name,DATE_FORMAT(uploadTime,'%Y-%m-%d') uploadTime,browseNum from res_book  where DATE_SUB(CURDATE(), INTERVAL 7 DAY) &lt; date(uploadTime) "
+			   + "<if test = '" + NOTBLANK + "(form.beginTime)'>"  
+			    + "and uploadTime &gt;= concat(#{form.beginTime}, ' 00:00:00' )"
+			    + "</if>" 
+			    + "<if test = '" + NOTBLANK + "(form.endTime)'>"  
+			    + "and uploadTime &lt;= concat(#{form.endTime}, ' 23:59:59')"
+			    + "</if>"
+			    + " ORDER BY uploadTime desc"
+			+ "</script>")
+	List<EbookListStatisticsVO> queryBookReadingVolume(@Param("form")QueryStatisticsForm form);
 	
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/articlelibrary/ArticleLibrarySerivceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 import com.zrqx.core.enums.AllResourceTypeEnum;
 import com.zrqx.core.enums.resource.LibraryStatusEnum;
 import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
+import com.zrqx.core.form.resource.bg.QueryStatisticsForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.QueryArticleLibraryForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.SaveUpdateArticleLibraryForm;
 import com.zrqx.core.mapper.BaseMapper;
@@ -110,8 +111,8 @@ public class ArticleLibrarySerivceImpl extends BaseServiceImpl<ArticleLibrary,St
 		return new PageInfo<ResourceRelationListVo>(list);
 	}
 	@Override
-	public List<ArticleLibraryListStatisticsVO> queryArticleReadingVolume() {
-		List<ArticleLibraryListStatisticsVO> list = mapper.queryArticleReadingVolume();
+	public List<ArticleLibraryListStatisticsVO> queryArticleReadingVolume(QueryStatisticsForm form) {
+		List<ArticleLibraryListStatisticsVO> list = mapper.queryArticleReadingVolume(form);
 		return list;
 	}
 

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/articlelibrary/ArticleLibraryService.java

@@ -3,6 +3,7 @@ package com.zrqx.resource.bg.service.articlelibrary;
 import java.util.List;
 
 import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
+import com.zrqx.core.form.resource.bg.QueryStatisticsForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.QueryArticleLibraryForm;
 import com.zrqx.core.form.resource.bg.articlelibrary.SaveUpdateArticleLibraryForm;
 import com.zrqx.core.model.resource.articlelibrary.ArticleLibrary;
@@ -29,5 +30,5 @@ public interface ArticleLibraryService extends BaseService<ArticleLibrary,String
 	 */
 	PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
 	
-	List<ArticleLibraryListStatisticsVO> queryArticleReadingVolume();
+	List<ArticleLibraryListStatisticsVO> queryArticleReadingVolume(QueryStatisticsForm form);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/BookService.java

@@ -3,6 +3,7 @@ package com.zrqx.resource.bg.service.ebook;
 import java.util.List;
 
 import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
+import com.zrqx.core.form.resource.bg.QueryStatisticsForm;
 import com.zrqx.core.model.resource.ebook.Book;
 import com.zrqx.core.service.BaseService;
 import com.zrqx.core.util.page.PageInfo;
@@ -19,5 +20,5 @@ public interface BookService extends BaseService<Book, String> {
 
 	PageInfo<ResourceRelationListVo> pageByTitleAndDiyType(QueryResourceForPoPForm form, PageParam pageParam);
 
-	List<EbookListStatisticsVO> queryBookReadingVolume();
+	List<EbookListStatisticsVO> queryBookReadingVolume(QueryStatisticsForm form);
 }

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/service/ebook/BookServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.zrqx.core.form.resource.bg.QueryResourceForPoPForm;
+import com.zrqx.core.form.resource.bg.QueryStatisticsForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.ebook.Book;
 import com.zrqx.core.service.BaseServiceImpl;
@@ -45,8 +46,8 @@ public class BookServiceImpl extends BaseServiceImpl<Book, String> implements
 	}
 
 	@Override
-	public List<EbookListStatisticsVO> queryBookReadingVolume() {
-		List<EbookListStatisticsVO> list = bookMapper.queryBookReadingVolume();
+	public List<EbookListStatisticsVO> queryBookReadingVolume(QueryStatisticsForm form) {
+		List<EbookListStatisticsVO> list = bookMapper.queryBookReadingVolume(form);
 		return list;
 	}