Tenlion/cm-cloud
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wenc000 2020-04-19 21:11:12 +08:00
commit 288fdc5c61
7 changed files with 116 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cloud-common-article/src/main/java/com/cm/common/article/controller/apis/articlecontent/ArticleContentController.java
View File

@ -1,6 +1,9 @@
package com.cm.common.article.controller.apis.articlecontent;
import com.cm.common.annotation.CheckRequestBodyAnnotation;
import com.cm.common.article.pojo.dtos.articlecontent.ArticleContentDTO;
import com.cm.common.article.pojo.vos.articlecontent.ArticleContentVO;
import com.cm.common.article.service.articlecontent.IArticleContentService;
import com.cm.common.base.AbstractController;
import com.cm.common.component.SecurityComponent;
import com.cm.common.constants.ISystemConstant;
@ -11,17 +14,14 @@ import com.cm.common.pojo.ListPage;
import com.cm.common.pojo.dtos.CurrentUserIdInfoDTO;
import com.cm.common.result.ErrorResult;
import com.cm.common.result.SuccessResult;
import com.cm.common.result.SuccessResultData;
import com.cm.common.result.SuccessResultList;
import com.cm.common.article.pojo.dtos.articlecontent.ArticleContentDTO;
import com.cm.common.article.pojo.vos.articlecontent.ArticleContentVO;
import com.cm.common.article.service.articlecontent.IArticleContentService;
import com.cm.common.utils.RegexUtil;
import io.swagger.annotations.*;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -102,6 +102,9 @@ public class ArticleContentController extends AbstractController {
@ApiOperation(value = "文章内容列表", notes = "文章内容列表接口")
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@ApiImplicitParams({
@ApiImplicitParam(name = "articleCategoryId", value = "文章目录", paramType = "form", dataType = "String")
})
@GetMapping("listarticlecontent")
public List<ArticleContentDTO> listArticleContent() throws SearchException {
Map<String, Object> params = requestParams();
@ -110,11 +113,12 @@ public class ArticleContentController extends AbstractController {
@ApiOperation(value = "文章内容分页列表", notes = "文章内容分页列表接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "page", value = "当前页码", paramType = "form", dataType = "Integer", defaultValue = "1"),
@ApiImplicitParam(name = "rows", value = "显示数量", paramType = "form", dataType = "Integer", defaultValue = "20"),
@ApiImplicitParam(name = "keywords", value = "关键字", paramType = "form", dataType = "String"),
@ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "form", dataType = "String"),
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "form", dataType = "String")
@ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "Integer", defaultValue = "1"),
@ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "Integer", defaultValue = "20"),
@ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "articleCategoryId", value = "文章目录", paramType = "query", dataType = "String")
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("listpagearticlecontent")
@ -131,4 +135,15 @@ public class ArticleContentController extends AbstractController {
return securityComponent.getCurrentUserIdInfo();
}
@ApiOperation(value = "统计文章数量", notes = "统计文章数量接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "articleCategoryId", value = "文章目录", paramType = "form", dataType = "String")
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("countarticlecount")
public SuccessResultData<Integer> countArticleCount() {
Map<String, Object> params = requestParams();
return articleContentService.countArticleCount(params);
}
}

34
cloud-common-article/src/main/java/com/cm/common/article/controller/app/apis/articlecontent/ArticleContentAppController.java
View File

@ -1,6 +1,9 @@
package com.cm.common.article.controller.app.apis.articlecontent;
import com.cm.common.annotation.CheckRequestBodyAnnotation;
import com.cm.common.article.pojo.dtos.articlecontent.ArticleContentDTO;
import com.cm.common.article.pojo.vos.articlecontent.ArticleContentVO;
import com.cm.common.article.service.articlecontent.IArticleContentService;
import com.cm.common.base.AbstractController;
import com.cm.common.constants.ISystemConstant;
import com.cm.common.exception.RemoveException;
@ -8,15 +11,12 @@ import com.cm.common.exception.SearchException;
import com.cm.common.pojo.ListPage;
import com.cm.common.result.ErrorResult;
import com.cm.common.result.SuccessResult;
import com.cm.common.result.SuccessResultData;
import com.cm.common.result.SuccessResultList;
import com.cm.common.article.pojo.dtos.articlecontent.ArticleContentDTO;
import com.cm.common.article.pojo.vos.articlecontent.ArticleContentVO;
import com.cm.common.article.service.articlecontent.IArticleContentService;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -82,7 +82,8 @@ public class ArticleContentAppController extends AbstractController {
@ApiOperation(value = "文章内容列表", notes = "文章内容列表接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", paramType = "header")
@ApiImplicitParam(name = "token", value = "token", paramType = "header"),
@ApiImplicitParam(name = "articleCategoryId", value = "文章目录", paramType = "query", dataType = "String")
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("listarticlecontent")
@ -94,11 +95,12 @@ public class ArticleContentAppController extends AbstractController {
@ApiOperation(value = "文章内容分页列表", notes = "文章内容分页列表接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", paramType = "header"),
@ApiImplicitParam(name = "page", value = "当前页码", paramType = "form", dataType = "Integer", defaultValue = "1"),
@ApiImplicitParam(name = "rows", value = "显示数量", paramType = "form", dataType = "Integer", defaultValue = "20"),
@ApiImplicitParam(name = "keywords", value = "关键字", paramType = "form", dataType = "String"),
@ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "form", dataType = "String"),
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "form", dataType = "String")
@ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "Integer", defaultValue = "1"),
@ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "Integer", defaultValue = "20"),
@ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "articleCategoryId", value = "文章目录", paramType = "query", dataType = "String")
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("listpagearticlecontent")
@ -108,4 +110,16 @@ public class ArticleContentAppController extends AbstractController {
return articleContentService.listPageArticleContent(page);
}
@ApiOperation(value = "统计文章数量", notes = "统计文章数量接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "token", value = "token", paramType = "header"),
@ApiImplicitParam(name = "articleCategoryId", value = "文章目录", paramType = "form", dataType = "String")
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("countarticlecount")
public SuccessResultData<Integer> countArticleCount() {
Map<String, Object> params = requestParams();
return articleContentService.countArticleCount(params);
}
}

34
cloud-common-article/src/main/java/com/cm/common/article/controller/resources/articlecontent/ArticleContentResourceController.java
View File

@ -1,6 +1,9 @@
package com.cm.common.article.controller.resources.articlecontent;
import com.cm.common.annotation.CheckRequestBodyAnnotation;
import com.cm.common.article.pojo.dtos.articlecontent.ArticleContentDTO;
import com.cm.common.article.pojo.vos.articlecontent.ArticleContentVO;
import com.cm.common.article.service.articlecontent.IArticleContentService;
import com.cm.common.base.AbstractController;
import com.cm.common.constants.ISystemConstant;
import com.cm.common.exception.RemoveException;
@ -8,15 +11,12 @@ import com.cm.common.exception.SearchException;
import com.cm.common.pojo.ListPage;
import com.cm.common.result.ErrorResult;
import com.cm.common.result.SuccessResult;
import com.cm.common.result.SuccessResultData;
import com.cm.common.result.SuccessResultList;
import com.cm.common.article.pojo.dtos.articlecontent.ArticleContentDTO;
import com.cm.common.article.pojo.vos.articlecontent.ArticleContentVO;
import com.cm.common.article.service.articlecontent.IArticleContentService;
import io.swagger.annotations.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@ -82,7 +82,8 @@ public class ArticleContentResourceController extends AbstractController {
@ApiOperation(value = "文章内容列表", notes = "文章内容列表接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query")
@ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"),
@ApiImplicitParam(name = "articleCategoryId", value = "文章目录", paramType = "query", dataType = "String")
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("listarticlecontent")
@ -94,11 +95,12 @@ public class ArticleContentResourceController extends AbstractController {
@ApiOperation(value = "文章内容分页列表", notes = "文章内容分页列表接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"),
@ApiImplicitParam(name = "page", value = "当前页码", paramType = "form", dataType = "Integer", defaultValue = "1"),
@ApiImplicitParam(name = "rows", value = "显示数量", paramType = "form", dataType = "Integer", defaultValue = "20"),
@ApiImplicitParam(name = "keywords", value = "关键字", paramType = "form", dataType = "String"),
@ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "form", dataType = "String"),
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "form", dataType = "String")
@ApiImplicitParam(name = "page", value = "当前页码", paramType = "query", dataType = "Integer", defaultValue = "1"),
@ApiImplicitParam(name = "rows", value = "显示数量", paramType = "query", dataType = "Integer", defaultValue = "20"),
@ApiImplicitParam(name = "keywords", value = "关键字", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "articleCategoryId", value = "文章目录", paramType = "query", dataType = "String")
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("listpagearticlecontent")
@ -108,4 +110,16 @@ public class ArticleContentResourceController extends AbstractController {
return articleContentService.listPageArticleContent(page);
}
@ApiOperation(value = "统计文章数量", notes = "统计文章数量接口")
@ApiImplicitParams({
@ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query"),
@ApiImplicitParam(name = "articleCategoryId", value = "文章目录", paramType = "form", dataType = "String")
})
@ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
@GetMapping("countarticlecount")
public SuccessResultData<Integer> countArticleCount() {
Map<String, Object> params = requestParams();
return articleContentService.countArticleCount(params);
}
}

13
cloud-common-article/src/main/java/com/cm/common/article/dao/articlecontent/IArticleContentDao.java
View File

@ -1,11 +1,10 @@
package com.cm.common.article.dao.articlecontent;
import com.cm.common.article.pojo.dtos.articlecontent.ArticleContentDTO;
import com.cm.common.exception.RemoveException;
import com.cm.common.exception.SaveException;
import com.cm.common.exception.SearchException;
import com.cm.common.exception.UpdateException;
import com.cm.common.result.SuccessResultList;
import com.cm.common.article.pojo.dtos.articlecontent.ArticleContentDTO;
import org.springframework.stereotype.Repository;
import java.util.List;
@ -62,5 +61,13 @@ public interface IArticleContentDao {
* @throws SearchException
*/
List<ArticleContentDTO> listArticleContent(Map<String, Object> params) throws SearchException;
/**
* 统计文章数量
*
* @param params
* @return
* @throws SearchException
*/
Integer countArticleCount(Map<String, Object> params) throws SearchException;
}

13
cloud-common-article/src/main/java/com/cm/common/article/service/articlecontent/IArticleContentService.java
View File

@ -1,15 +1,14 @@
package com.cm.common.article.service.articlecontent;
import com.cm.common.article.pojo.dtos.articlecontent.ArticleContentDTO;
import com.cm.common.article.pojo.vos.articlecontent.ArticleContentVO;
import com.cm.common.exception.RemoveException;
import com.cm.common.exception.SaveException;
import com.cm.common.exception.SearchException;
import com.cm.common.exception.UpdateException;
import com.cm.common.pojo.ListPage;
import com.cm.common.result.SuccessResult;
import com.cm.common.result.SuccessResultData;
import com.cm.common.result.SuccessResultList;
import com.cm.common.article.pojo.dtos.articlecontent.ArticleContentDTO;
import com.cm.common.article.pojo.vos.articlecontent.ArticleContentVO;
import java.util.List;
import java.util.Map;
@ -119,4 +118,12 @@ public interface IArticleContentService {
*/
SuccessResultList<List<ArticleContentDTO>> listPageArticleContent(ListPage page) throws SearchException;
/**
* 统计文章数量
*
* @param params
* @return
* @throws SearchException
*/
SuccessResultData<Integer> countArticleCount(Map<String, Object> params) throws SearchException;
}

6
cloud-common-article/src/main/java/com/cm/common/article/service/articlecontent/impl/ArticleContentServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.cm.common.exception.SearchException;
import com.cm.common.exception.UpdateException;
import com.cm.common.pojo.ListPage;
import com.cm.common.result.SuccessResult;
import com.cm.common.result.SuccessResultData;
import com.cm.common.result.SuccessResultList;
import com.cm.common.utils.HashMapUtil;
import com.cm.common.utils.UUIDUtil;
@ -154,4 +155,9 @@ public class ArticleContentServiceImpl extends AbstractService implements IArtic
return new SuccessResultList<>(articleContentDTOs, pageInfo.getPageNum(), pageInfo.getTotal());
}
@Override
public SuccessResultData<Integer> countArticleCount(Map<String, Object> params) throws SearchException {
Integer countArticleCount = articleContentDao.countArticleCount(params);
return new SuccessResultData<>(countArticleCount == null ? 0 : countArticleCount);
}
}

18
cloud-common-article/src/main/resources/mybatis/mapper/articlecontent/articlecontent-mapper.xml
View File

@ -191,4 +191,22 @@
</if>
</select>
<!-- 统计文章数量 -->
<select id="countArticleCount" parameterType="map" resultType="Integer">
SELECT
COUNT(*)
FROM
article_content
WHERE
is_delete = 0
<if test="articleCategoryId != null and articleCategoryId != ''">
AND
article_category_id = #{articleCategoryId}
</if>
<if test="isPublish != null">
AND
is_publish = #{isPublish}
</if>
</select>
</mapper>