diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
new file mode 100644
index 0000000..55afae8
--- /dev/null
+++ b/.idea/dataSources.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ redis
+ true
+ jdbc.RedisDriver
+ jdbc:redis://localhost:6379/0
+ $ProjectFileDir$
+
+
+
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..2b63946
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 55c451f..50b70af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,12 +264,40 @@
weixin-java-miniapp
4.6.0
+
+
+ com.github.binarywang
+ wx-java-mp-spring-boot-starter
+ 4.6.0
+
com.aliyun.oss
aliyun-sdk-oss
- 3.17.0
+ 3.18.1
+
+
+ com.aliyun
+ sts20150401
+ 1.1.6
+
+
+ com.aliyun
+ credentials-java
+ 0.3.4
+
+
+
+ com.aliyun.mns
+ aliyun-sdk-mns
+ 1.1.11
+
+
+
+ com.aliyun.kms
+ kms-transfer-client
+ 0.1.0
diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleCheckController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleCheckController.java
new file mode 100644
index 0000000..a8dd5ad
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleCheckController.java
@@ -0,0 +1,178 @@
+package com.gxwebsoft.cms.controller;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
+import cn.hutool.core.date.DateUtil;
+import com.gxwebsoft.cms.entity.Article;
+import com.gxwebsoft.cms.service.ArticleService;
+import com.gxwebsoft.common.core.security.JwtUtil;
+import com.gxwebsoft.common.core.utils.RequestUtil;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.cms.service.ArticleCheckService;
+import com.gxwebsoft.cms.entity.ArticleCheck;
+import com.gxwebsoft.cms.param.ArticleCheckParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.shop.controller.WeChatController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 控制器
+ *
+ * @author 科技小王子
+ * @since 2024-11-19 22:01:03
+ */
+@Api(tags = "管理")
+@RestController
+@RequestMapping("/api/cms/article-check")
+public class ArticleCheckController extends BaseController {
+ @Resource
+ private ArticleCheckService articleCheckService;
+ @Resource
+ private ArticleService articleService;
+
+ @Autowired
+ private WeChatController weChatController;
+ @Autowired
+ private RequestUtil requestUtil;
+
+ @ApiOperation("分页查询")
+ @GetMapping("/page")
+ public ApiResult> page(ArticleCheckParam param) {
+ // 使用关联查询
+ return success(articleCheckService.pageRel(param));
+ }
+
+ @ApiOperation("查询全部")
+ @GetMapping()
+ public ApiResult> list() {
+ ArticleCheckParam param = new ArticleCheckParam();
+ param.setUserId(getLoginUserId());
+ param.setStatus(0);
+ // 使用关联查询
+ List list = articleCheckService.listRel(param);
+ for (ArticleCheck articleCheck : list) {
+ articleCheck.setArticle(articleService.getByIdRel(articleCheck.getArticleId()));
+ }
+ return success(list);
+ }
+
+ @PreAuthorize("hasAuthority('cms:articleCheck:list')")
+ @ApiOperation("根据id查询")
+ @GetMapping("/{id}")
+ public ApiResult get(@PathVariable("id") Integer id) {
+ // 使用关联查询
+ return success(articleCheckService.getByIdRel(id));
+ }
+
+ @ApiOperation("添加")
+ @PostMapping()
+ public ApiResult save(@RequestBody ArticleCheck articleCheck) {
+ // 记录当前登录用户id
+ User loginUser = getLoginUser();
+ if (loginUser != null) {
+ articleCheck.setUserId(loginUser.getUserId());
+ }
+ if (articleCheckService.save(articleCheck)) {
+ return success("添加成功");
+ }
+ return fail("添加失败");
+ }
+
+ @ApiOperation("修改")
+ @PutMapping()
+ public ApiResult update(@RequestBody ArticleCheck articleCheck, HttpServletRequest request) throws WxErrorException {
+ if (articleCheckService.updateById(articleCheck)) {
+ ArticleCheck articleCheck1 = articleCheckService.getByIdRel(articleCheck.getId());
+ List articleCheckList = articleCheckService.listByArticleId(articleCheck1.getArticleId());
+ Article article = articleService.getById(articleCheck1.getArticleId());
+ boolean sendMsg = false;
+ String result = "";
+ if (articleCheck.getStatus().equals(2)) {
+ article.setStatus(2);
+ articleService.updateById(article);
+ sendMsg = true;
+ result = "驳回";
+ } else if (articleCheck.getStatus().equals(1)) {
+ int passNum = 0;
+ for (ArticleCheck articleCheck2 : articleCheckList) {
+ if (articleCheck2.getStatus().equals(1)) {
+ passNum++;
+ }
+ }
+ if (passNum == articleCheckList.size()) {
+ article.setStatus(0);
+ articleService.updateById(article);
+ sendMsg = true;
+ result = "通过";
+ }
+ }
+ if (sendMsg) {
+ requestUtil.setTenantId(getTenantId().toString());
+ requestUtil.setAccessToken(JwtUtil.getAccessToken(request));
+ User user = requestUtil.getByUserId(article.getUserId());
+ if (user != null) {
+ List data = new ArrayList<>();
+ data.add(new WxMaSubscribeMessage.MsgData("thing5", article.getTitle()));
+ data.add(new WxMaSubscribeMessage.MsgData("thing2", result));
+ data.add(new WxMaSubscribeMessage.MsgData("time4", DateUtil.format(DateUtil.date(), "yyyy-MM-dd HH:mm:ss")));
+ weChatController.sendMessage(user.getOpenid(), "NLnexmnhiVl_e4fiC6OwfbTlpssAuvXWoPNwITyTcC4", "package/user/myTv",
+ data);
+ }
+ }
+ return success("修改成功");
+ }
+ return fail("修改失败");
+ }
+
+ @ApiOperation("删除")
+ @DeleteMapping("/{id}")
+ public ApiResult remove(@PathVariable("id") Integer id) {
+ if (articleCheckService.removeById(id)) {
+ return success("删除成功");
+ }
+ return fail("删除失败");
+ }
+
+ @ApiOperation("批量添加")
+ @PostMapping("/batch")
+ public ApiResult saveBatch(@RequestBody List list) {
+ if (articleCheckService.saveBatch(list)) {
+ return success("添加成功");
+ }
+ return fail("添加失败");
+ }
+
+ @ApiOperation("批量修改")
+ @PutMapping("/batch")
+ public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
+ if (batchParam.update(articleCheckService, "id")) {
+ return success("修改成功");
+ }
+ return fail("修改失败");
+ }
+
+ @ApiOperation("批量删除")
+ @DeleteMapping("/batch")
+ public ApiResult removeBatch(@RequestBody List ids) {
+ if (articleCheckService.removeByIds(ids)) {
+ return success("删除成功");
+ }
+ return fail("删除失败");
+ }
+
+}
diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java
index 77a7c2a..72623e4 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleCommentController.java
@@ -1,5 +1,7 @@
package com.gxwebsoft.cms.controller;
+import com.gxwebsoft.cms.entity.Article;
+import com.gxwebsoft.cms.service.ArticleService;
import com.gxwebsoft.common.core.web.BaseController;
import com.gxwebsoft.cms.service.ArticleCommentService;
import com.gxwebsoft.cms.entity.ArticleComment;
@@ -10,6 +12,7 @@ import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.annotation.OperationLog;
import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -30,8 +33,11 @@ import java.util.List;
public class ArticleCommentController extends BaseController {
@Resource
private ArticleCommentService articleCommentService;
+ @Resource
+ private UserService userService;
+ @Resource
+ private ArticleService articleService;
- @PreAuthorize("hasAuthority('cms:articleComment:list')")
@ApiOperation("分页查询文章评论表")
@GetMapping("/page")
public ApiResult> page(ArticleCommentParam param) {
@@ -42,7 +48,6 @@ public class ArticleCommentController extends BaseController {
//return success(articleCommentService.pageRel(param));
}
- @PreAuthorize("hasAuthority('cms:articleComment:list')")
@ApiOperation("查询全部文章评论表")
@GetMapping()
public ApiResult> list(ArticleCommentParam param) {
@@ -53,7 +58,6 @@ public class ArticleCommentController extends BaseController {
//return success(articleCommentService.listRel(param));
}
- @PreAuthorize("hasAuthority('cms:articleComment:list')")
@ApiOperation("根据id查询文章评论表")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
@@ -62,16 +66,20 @@ public class ArticleCommentController extends BaseController {
//return success(articleCommentService.getByIdRel(id));
}
- @PreAuthorize("hasAuthority('cms:articleComment:save')")
@ApiOperation("添加文章评论表")
@PostMapping()
public ApiResult save(@RequestBody ArticleComment articleComment) {
// 记录当前登录用户id
User loginUser = getLoginUser();
if (loginUser != null) {
- articleComment.setUserId(loginUser.getUserId());
+ articleComment.setUserId(loginUser.getUserId());
+ articleComment.setAvatar(loginUser.getAvatar());
+ articleComment.setNickname(loginUser.getNickname());
}
if (articleCommentService.save(articleComment)) {
+ Article article = articleService.getById(articleComment.getArticleId());
+ article.setCommentNumbers(article.getCommentNumbers() + 1);
+ articleService.updateById(article);
return success("添加成功");
}
return fail("添加失败");
@@ -87,11 +95,14 @@ public class ArticleCommentController extends BaseController {
return fail("修改失败");
}
- @PreAuthorize("hasAuthority('cms:articleComment:remove')")
@ApiOperation("删除文章评论表")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
+ ArticleComment articleComment = articleCommentService.getById(id);
if (articleCommentService.removeById(id)) {
+ Article article = articleService.getById(articleComment.getArticleId());
+ article.setCommentNumbers(article.getCommentNumbers() - 1);
+ articleService.updateById(article);
return success("删除成功");
}
return fail("删除失败");
diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
index 871d321..f312aab 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleController.java
@@ -1,28 +1,42 @@
package com.gxwebsoft.cms.controller;
+import com.aliyun.mns.client.CloudAccount;
+import com.aliyun.mns.client.CloudQueue;
+import com.aliyun.mns.client.MNSClient;
+import com.aliyun.mns.model.Message;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.gxwebsoft.cms.entity.Article;
import com.gxwebsoft.cms.entity.ArticleCategory;
+import com.gxwebsoft.cms.entity.ArticleCheck;
import com.gxwebsoft.cms.entity.ArticleContent;
import com.gxwebsoft.cms.param.ArticleParam;
import com.gxwebsoft.cms.service.ArticleCategoryService;
+import com.gxwebsoft.cms.service.ArticleCheckService;
import com.gxwebsoft.cms.service.ArticleContentService;
import com.gxwebsoft.cms.service.ArticleService;
+import com.gxwebsoft.common.core.security.JwtUtil;
+import com.gxwebsoft.common.core.utils.RequestUtil;
import com.gxwebsoft.common.core.web.ApiResult;
import com.gxwebsoft.common.core.web.BaseController;
import com.gxwebsoft.common.core.web.BatchParam;
import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.controller.AliOssController;
import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.entity.UserRole;
+import com.gxwebsoft.open.service.OfficeMpServiceImpl;
import com.gxwebsoft.shop.entity.Goods;
import com.gxwebsoft.shop.param.GoodsParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -44,103 +58,163 @@ public class ArticleController extends BaseController {
private ArticleCategoryService articleCategoryService;
@Resource
private ArticleContentService articleContentService;
+ @Resource
+ private ArticleCheckService articleCheckService;
+ @Resource
+ private OfficeMpServiceImpl officeMpService;
+
+ @Autowired
+ private RequestUtil requestUtil;
+ @Autowired
+ private AliOssController aliOssController;
@ApiOperation("分页查询文章")
@GetMapping("/page")
- public ApiResult> page(ArticleParam param) {
+ public ApiResult> page(ArticleParam param) {
// 使用关联查询
+ if (getLoginUser() != null) {
+ param.setLoginUserId(getLoginUserId());
+ }
+ if (param.getMinData() != null) return success(articleService.pageMinData(param));
return success(articleService.pageRel(param));
}
+ @GetMapping("/user-list")
+ public ApiResult> userList(ArticleParam param) {
+ // 使用关联查询
+ if (getLoginUser() != null) {
+ param.setUserId(getLoginUserId());
+ }
+ return success(articleService.listRel(param));
+ }
+
@ApiOperation("查询全部文章")
@GetMapping()
- public ApiResult> list(ArticleParam param) {
+ public ApiResult> list(ArticleParam param) {
// 使用关联查询
+ if (getLoginUser() != null) {
+ param.setLoginUserId(getLoginUserId());
+ }
+ if (param.getMinData() != null) return success(articleService.listMinData(param));
return success(articleService.listRel(param));
}
@ApiOperation("根据id查询文章")
@GetMapping("/{id}")
public ApiResult get(@PathVariable("id") Integer id) {
- // 使用关联查询
- Article article = articleService.getByIdRel(id);
- // 更新阅读数量
- article.setActualViews(article.getActualViews() + 1);
- articleService.updateById(article);
- // 附加文字内容
- ArticleContent content = articleContentService.getOne(new LambdaQueryWrapper().eq(ArticleContent::getArticleId,article.getArticleId()).last("limit 1"));
- if(content != null){
- article.setContent(content.getContent());
- }
- return success(article);
+ // 使用关联查询
+ Article article = articleService.getByIdRel(id);
+ // 更新阅读数量
+ article.setActualViews(article.getActualViews() + 1);
+ articleService.updateById(article);
+ // 附加文字内容
+ ArticleContent content = articleContentService.getOne(new LambdaQueryWrapper().eq(ArticleContent::getArticleId, article.getArticleId()).last("limit 1"));
+ if (content != null) {
+ article.setContent(content.getContent());
+ }
+ return success(article);
}
@ApiOperation("读取上一篇")
@GetMapping("/getPrevious/{id}")
public ApiResult getPrevious(@PathVariable("id") Integer id) {
- LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
- wrapper.lt(Article::getArticleId,id);
- wrapper.eq(Article::getStatus,0);
- wrapper.eq(Article::getType,0);
- wrapper.orderByDesc(Article::getArticleId);
- wrapper.last("limit 1");
- final Article article = articleService.getOne(wrapper);
- return success(article);
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ wrapper.lt(Article::getArticleId, id);
+ wrapper.eq(Article::getStatus, 0);
+ wrapper.eq(Article::getType, 0);
+ wrapper.orderByDesc(Article::getArticleId);
+ wrapper.last("limit 1");
+ final Article article = articleService.getOne(wrapper);
+ return success(article);
}
@ApiOperation("读取下一篇")
@GetMapping("/getNext/{id}")
public ApiResult getNext(@PathVariable("id") Integer id) {
- LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
- wrapper.gt(Article::getArticleId,id);
- wrapper.eq(Article::getStatus,0);
- wrapper.eq(Article::getType,0);
- wrapper.orderByAsc(Article::getArticleId);
- wrapper.last("limit 1");
- final Article article = articleService.getOne(wrapper);
- return success(article);
+ LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ wrapper.gt(Article::getArticleId, id);
+ wrapper.eq(Article::getStatus, 0);
+ wrapper.eq(Article::getType, 0);
+ wrapper.orderByAsc(Article::getArticleId);
+ wrapper.last("limit 1");
+ final Article article = articleService.getOne(wrapper);
+ return success(article);
}
@PreAuthorize("hasAuthority('cms:article:save')")
@ApiOperation("添加文章")
@Transactional(rollbackFor = {Exception.class})
@PostMapping()
- public ApiResult save(@RequestBody Article article) {
+ public ApiResult save(@RequestBody Article article, HttpServletRequest request) throws WxErrorException {
// 记录当前登录用户id
User loginUser = getLoginUser();
if (loginUser != null) {
- article.setUserId(loginUser.getUserId());
+ article.setUserId(loginUser.getUserId());
+ article.setUserAvatar(loginUser.getAvatar());
+ article.setUsername(loginUser.getNickname());
}
// 同步类型
// final ArticleCategory category = articleCategoryService.getById(article.getCategoryId());
// article.setType(category.getType());
if (articleService.save(article)) {
- // 保存文章内容
- final ArticleContent content = new ArticleContent();
- content.setArticleId(article.getArticleId());
- content.setContent(article.getContent());
- articleContentService.save(content);
- return success("添加成功");
+ if (article.getBucket() != null) aliOssController.videoTrans(article.getBucket());
+ // 保存文章内容
+ final ArticleContent content = new ArticleContent();
+ content.setArticleId(article.getArticleId());
+ content.setContent(article.getContent());
+ articleContentService.save(content);
+
+ if (article.getIsFront() != null && article.getIsFront()) {
+ requestUtil.setTenantId(getTenantId().toString());
+ requestUtil.setAccessToken(JwtUtil.getAccessToken(request));
+ List userRoleList = requestUtil.getUserListByRole(1114);
+ if (userRoleList != null && !userRoleList.isEmpty()) {
+ for (UserRole userRole : userRoleList) {
+ User user = requestUtil.getByUserId(userRole.getUserId());
+ ArticleCheck articleCheck = new ArticleCheck();
+ articleCheck.setArticleId(article.getArticleId());
+ articleCheck.setUserId(userRole.getUserId());
+ articleCheckService.save(articleCheck);
+
+ if (user != null && user.getOfficeOpenid() != null && !user.getOfficeOpenid().isEmpty()) {
+ officeMpService.sendTVCheckMessage(user.getOfficeOpenid(), article.getTitle(), loginUser.getNickname());
+ }
+ }
+ }
+ }
+ return success("添加成功");
}
return fail("添加失败");
}
- @PreAuthorize("hasAuthority('cms:article:update')")
+ @PostMapping("/trans")
+ public ApiResult trans(@RequestBody Article article) {
+// aliOssController.videoTrans(article.getVideo());
+ return success();
+ }
+
+ @ApiOperation("转码拉取消息")
+ @PostMapping("/trans-pull")
+ public ApiResult transNotify() {
+ aliOssController.pullVideoTrans();
+ return success();
+ }
+
@ApiOperation("修改文章")
@Transactional(rollbackFor = {Exception.class})
@PutMapping()
- public ApiResult update(@RequestBody Article article) {
+ public ApiResult update(@RequestBody Article article, HttpServletRequest request) {
if (articleService.updateById(article)) {
// 更新文章内容
ArticleContent content = new ArticleContent();
content.setArticleId(article.getArticleId());
content.setContent(article.getContent());
ArticleContent one = articleContentService.getOne(new LambdaQueryWrapper().eq(ArticleContent::getArticleId, article.getArticleId()).last("limit 1"));
- if(one != null){
- one.setContent(article.getContent());
- articleContentService.updateById(one);
- }else {
- articleContentService.save(content);
+ if (one != null) {
+ one.setContent(article.getContent());
+ articleContentService.updateById(one);
+ } else {
+ articleContentService.save(content);
}
// 更新时间
article.setUpdateTime(new Date());
@@ -155,6 +229,9 @@ public class ArticleController extends BaseController {
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
if (articleService.removeById(id)) {
+ articleCheckService.removeByMap(new HashMap<>() {{
+ put("article_id", id);
+ }});
return success("删除成功");
}
return fail("删除失败");
@@ -190,33 +267,33 @@ public class ArticleController extends BaseController {
return fail("删除失败");
}
- @ApiOperation("统计信息")
- @GetMapping("/data")
- public ApiResult> data(ArticleParam param) {
- Map data = new HashMap<>();
- final LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
+ @ApiOperation("统计信息")
+ @GetMapping("/data")
+ public ApiResult> data(ArticleParam param) {
+ Map data = new HashMap<>();
+ final LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>();
- if(param.getMerchantId() != null){
- wrapper.eq(Article::getMerchantId,param.getMerchantId());
+ if (param.getMerchantId() != null) {
+ wrapper.eq(Article::getMerchantId, param.getMerchantId());
+ }
+
+ Integer totalNum = articleService.count(
+ wrapper.eq(Article::getDeleted, 0).eq(Article::getStatus, 0)
+ );
+ data.put("totalNum", totalNum);
+
+ Integer totalNum2 = articleService.count(
+ wrapper.eq(Article::getStatus, 1)
+ );
+ data.put("totalNum2", totalNum2);
+
+ Integer totalNum3 = articleService.count(
+ wrapper.gt(Article::getStatus, 1)
+ );
+ data.put("totalNum3", totalNum3);
+
+ return success(data);
}
- Integer totalNum = articleService.count(
- wrapper.eq(Article::getDeleted,0).eq(Article::getStatus,0)
- );
- data.put("totalNum", totalNum);
-
- Integer totalNum2 = articleService.count(
- wrapper.eq(Article::getStatus,1)
- );
- data.put("totalNum2", totalNum2);
-
- Integer totalNum3 = articleService.count(
- wrapper.gt(Article::getStatus,1)
- );
- data.put("totalNum3", totalNum3);
-
- return success(data);
- }
-
}
diff --git a/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java b/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java
index e8b54de..5f6c20a 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/ArticleLikeController.java
@@ -1,5 +1,7 @@
package com.gxwebsoft.cms.controller;
+import com.gxwebsoft.cms.entity.Article;
+import com.gxwebsoft.cms.service.ArticleService;
import com.gxwebsoft.common.core.web.BaseController;
import com.gxwebsoft.cms.service.ArticleLikeService;
import com.gxwebsoft.cms.entity.ArticleLike;
@@ -16,6 +18,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.HashMap;
import java.util.List;
/**
@@ -30,6 +33,8 @@ import java.util.List;
public class ArticleLikeController extends BaseController {
@Resource
private ArticleLikeService articleLikeService;
+ @Resource
+ private ArticleService articleService;
@ApiOperation("分页查询点赞文章")
@GetMapping("/page")
@@ -59,22 +64,23 @@ public class ArticleLikeController extends BaseController {
//return success(articleLikeService.getByIdRel(id));
}
- @PreAuthorize("hasAuthority('cms:articleLike:save')")
@ApiOperation("添加点赞文章")
@PostMapping()
public ApiResult save(@RequestBody ArticleLike articleLike) {
// 记录当前登录用户id
User loginUser = getLoginUser();
if (loginUser != null) {
- articleLike.setUserId(loginUser.getUserId());
+ articleLike.setUserId(loginUser.getUserId());
}
if (articleLikeService.save(articleLike)) {
+ Article article = articleService.getById(articleLike.getArticleId());
+ article.setLikes(article.getLikes() + 1);
+ articleService.updateById(article);
return success("添加成功");
}
return fail("添加失败");
}
- @PreAuthorize("hasAuthority('cms:articleLike:update')")
@ApiOperation("修改点赞文章")
@PutMapping()
public ApiResult update(@RequestBody ArticleLike articleLike) {
@@ -84,7 +90,19 @@ public class ArticleLikeController extends BaseController {
return fail("修改失败");
}
- @PreAuthorize("hasAuthority('cms:articleLike:remove')")
+ @ApiOperation("删除点赞文章")
+ @DeleteMapping("/del-by-article/{articleId}")
+ public ApiResult removeByArticle(@PathVariable("articleId") Integer articleId) {
+ articleLikeService.removeByMap(new HashMap<>() {{
+ put("article_id", articleId);
+ put("user_id", getLoginUserId());
+ }});
+ Article article = articleService.getById(articleId);
+ article.setLikes(article.getLikes() - 1);
+ articleService.updateById(article);
+ return success("删除成功");
+ }
+
@ApiOperation("删除点赞文章")
@DeleteMapping("/{id}")
public ApiResult remove(@PathVariable("id") Integer id) {
@@ -94,7 +112,6 @@ public class ArticleLikeController extends BaseController {
return fail("删除失败");
}
- @PreAuthorize("hasAuthority('cms:articleLike:save')")
@ApiOperation("批量添加点赞文章")
@PostMapping("/batch")
public ApiResult saveBatch(@RequestBody List list) {
@@ -104,7 +121,6 @@ public class ArticleLikeController extends BaseController {
return fail("添加失败");
}
- @PreAuthorize("hasAuthority('cms:articleLike:update')")
@ApiOperation("批量修改点赞文章")
@PutMapping("/batch")
public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
@@ -114,7 +130,6 @@ public class ArticleLikeController extends BaseController {
return fail("修改失败");
}
- @PreAuthorize("hasAuthority('cms:articleLike:remove')")
@ApiOperation("批量删除点赞文章")
@DeleteMapping("/batch")
public ApiResult removeBatch(@RequestBody List ids) {
diff --git a/src/main/java/com/gxwebsoft/cms/controller/FollowController.java b/src/main/java/com/gxwebsoft/cms/controller/FollowController.java
new file mode 100644
index 0000000..8f16024
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/controller/FollowController.java
@@ -0,0 +1,126 @@
+package com.gxwebsoft.cms.controller;
+
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.cms.service.FollowService;
+import com.gxwebsoft.cms.entity.Follow;
+import com.gxwebsoft.cms.param.FollowParam;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.system.entity.User;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 关注控制器
+ *
+ * @author 科技小王子
+ * @since 2024-12-11 18:25:28
+ */
+@Api(tags = "关注管理")
+@RestController
+@RequestMapping("/api/cms/follow")
+public class FollowController extends BaseController {
+ @Resource
+ private FollowService followService;
+
+ @GetMapping("/check")
+ public ApiResult check(FollowParam param) {
+ // 使用关联查询
+ return success(followService.check(getLoginUserId(), param.getFollowUserId()));
+ }
+
+ @ApiOperation("分页查询关注")
+ @GetMapping("/page")
+ public ApiResult> page(FollowParam param) {
+ // 使用关联查询
+ return success(followService.pageRel(param));
+ }
+
+ @ApiOperation("查询全部关注")
+ @GetMapping()
+ public ApiResult> list(FollowParam param) {
+ // 使用关联查询
+ return success(followService.listRel(param));
+ }
+
+ @PreAuthorize("hasAuthority('cms:follow:list')")
+ @ApiOperation("根据id查询关注")
+ @GetMapping("/{id}")
+ public ApiResult get(@PathVariable("id") Integer id) {
+ // 使用关联查询
+ return success(followService.getByIdRel(id));
+ }
+
+ @ApiOperation("添加关注")
+ @PostMapping()
+ public ApiResult save(@RequestBody Follow follow) {
+ // 记录当前登录用户id
+ User loginUser = getLoginUser();
+ if (loginUser != null) {
+ follow.setUserId(loginUser.getUserId());
+ Follow follow1 = followService.check(loginUser.getUserId(), follow.getId());
+ if (follow1 != null) {
+ followService.removeById(follow1.getId());
+ return success("取消成功");
+ }
+ }
+ if (followService.save(follow)) {
+ return success("添加成功");
+ }
+ return fail("添加失败");
+ }
+
+ @ApiOperation("修改关注")
+ @PutMapping()
+ public ApiResult update(@RequestBody Follow follow) {
+ if (followService.updateById(follow)) {
+ return success("修改成功");
+ }
+ return fail("修改失败");
+ }
+
+ @ApiOperation("删除关注")
+ @DeleteMapping("/{id}")
+ public ApiResult remove(@PathVariable("id") Integer id) {
+ if (followService.removeById(id)) {
+ return success("删除成功");
+ }
+ return fail("删除失败");
+ }
+
+ @ApiOperation("批量添加关注")
+ @PostMapping("/batch")
+ public ApiResult saveBatch(@RequestBody List list) {
+ if (followService.saveBatch(list)) {
+ return success("添加成功");
+ }
+ return fail("添加失败");
+ }
+
+ @ApiOperation("批量修改关注")
+ @PutMapping("/batch")
+ public ApiResult removeBatch(@RequestBody BatchParam batchParam) {
+ if (batchParam.update(followService, "id")) {
+ return success("修改成功");
+ }
+ return fail("修改失败");
+ }
+
+ @ApiOperation("批量删除关注")
+ @DeleteMapping("/batch")
+ public ApiResult removeBatch(@RequestBody List ids) {
+ if (followService.removeByIds(ids)) {
+ return success("删除成功");
+ }
+ return fail("删除失败");
+ }
+
+}
diff --git a/src/main/java/com/gxwebsoft/cms/controller/MpController.java b/src/main/java/com/gxwebsoft/cms/controller/MpController.java
index 1e95970..71269c0 100644
--- a/src/main/java/com/gxwebsoft/cms/controller/MpController.java
+++ b/src/main/java/com/gxwebsoft/cms/controller/MpController.java
@@ -11,6 +11,7 @@ import com.gxwebsoft.cms.param.MpParam;
import com.gxwebsoft.cms.service.*;
import com.gxwebsoft.common.core.utils.JSONUtil;
import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.utils.RequestUtil;
import com.gxwebsoft.common.core.web.ApiResult;
import com.gxwebsoft.common.core.web.BaseController;
import com.gxwebsoft.common.core.web.BatchParam;
@@ -22,6 +23,7 @@ import com.gxwebsoft.shop.param.GoodsParam;
import com.gxwebsoft.shop.service.GoodsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -57,6 +59,9 @@ public class MpController extends BaseController {
@Resource
private RedisUtil redisUtil;
+ @Autowired
+ private RequestUtil requestUtil;
+
@ApiOperation("分页查询小程序")
@GetMapping("/page")
public ApiResult> page(MpParam param) {
@@ -304,29 +309,28 @@ public class MpController extends BaseController {
List goodsList = goodsService.getGoodsSpecType0(param);
if (getLoginUser() != null) {
+ User parentUser = requestUtil.getParent(getLoginUserId());
for (Goods goods : goodsList) {
BigDecimal originPrice = goods.getPrice();
goods.setPrice(goods.getSalePrice());
- if (getLoginUser().getGradeId().equals(33)) {
- if (goods.getDealerGift()) goods.setShowGift(true);
- goods.setPrice(goods.getDealerPrice());
+ // 会员
+ if (parentUser != null) {
+ if (goods.getPriceGift()) goods.setShowGift(true);
+// goods.setPrice(originPrice);
}
// 会员店
- if (getLoginUser().getGradeId().equals(31)) {
- goods.setPrice(originPrice);
- if (goods.getPriceGift()) goods.setShowGift(true);
+ if (getLoginUser().getGradeId() > 30 && goods.getBuyingPriceOpen().equals(1)) {
+ goods.setPrice(goods.getBuyingPrice());
+// if (goods.getPriceGift()) goods.setShowGift(true);
}
-// if (getLoginUser().getGradeId().equals(0)) {
-// goods.setPrice(goods.getSalePrice());
-// }
}
- }else {
+ } else {
for (Goods goods : goodsList) {
goods.setPrice(goods.getSalePrice());
}
}
layout.put("goods", goodsList);
- layout.put("foods", goodsService.getGoodsSpecType1());
+ layout.put("foods", goodsService.getGoodsSpecType1(param));
return success(layout);
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/Article.java b/src/main/java/com/gxwebsoft/cms/entity/Article.java
index c0d9ed6..0e05699 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/Article.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/Article.java
@@ -46,6 +46,14 @@ public class Article implements Serializable {
@ApiModelProperty(value = "封面图")
private String image;
+ private String cover;
+
+ private String userAvatar;
+
+ private String username;
+
+ private String shareCover;
+
private Integer imageWidth;
private Integer imageHeight;
@@ -154,6 +162,25 @@ public class Article implements Serializable {
@TableField(exist = false)
private String parentName;
+ @ApiModelProperty(value = "是否前台提交")
+ @TableField(exist = false)
+ private Boolean isFront;
+
+ @ApiModelProperty(value = "是否已关注")
+ @TableField(exist = false)
+ private Boolean hasFollow;
+
+ @ApiModelProperty(value = "粉丝数")
+ @TableField(exist = false)
+ private Integer fansNum;
+
+ @ApiModelProperty(value = "是否已点赞")
+ @TableField(exist = false)
+ private Boolean hasLike;
+
+ @TableField(exist = false)
+ private String bucket;
+
public String getStatusText() {
return ARTICLE_STATUS[this.status];
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/ArticleCheck.java b/src/main/java/com/gxwebsoft/cms/entity/ArticleCheck.java
new file mode 100644
index 0000000..df0ccf2
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/entity/ArticleCheck.java
@@ -0,0 +1,57 @@
+package com.gxwebsoft.cms.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ *
+ *
+ * @author 科技小王子
+ * @since 2024-11-19 22:01:03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "ArticleCheck对象", description = "")
+@TableName("cms_article_check")
+public class ArticleCheck implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value = "文章ID")
+ private Integer articleId;
+
+ private Integer userId;
+
+ @ApiModelProperty(value = "0待审核1通过2拒绝")
+ private Integer status;
+
+ @ApiModelProperty(value = "排序(数字越小越靠前)")
+ private Integer sortNumber;
+
+ @ApiModelProperty(value = "备注")
+ private String comments;
+
+ @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @TableLogic
+ private Integer deleted;
+
+ @ApiModelProperty(value = "租户id")
+ private Integer tenantId;
+
+ @ApiModelProperty(value = "创建时间")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "修改时间")
+ private LocalDateTime updateTime;
+
+ @TableField(exist = false)
+ private Article article;
+}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java b/src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java
index 12b9063..6a96366 100644
--- a/src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java
+++ b/src/main/java/com/gxwebsoft/cms/entity/ArticleComment.java
@@ -1,10 +1,8 @@
package com.gxwebsoft.cms.entity;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import java.io.Serializable;
import java.util.Date;
@@ -45,6 +43,10 @@ public class ArticleComment implements Serializable {
@ApiModelProperty(value = "评论者ID")
private Integer userId;
+ private String avatar;
+
+ private String nickname;
+
@ApiModelProperty(value = "被评价者ID")
private Integer toUserId;
@@ -75,5 +77,4 @@ public class ArticleComment implements Serializable {
@ApiModelProperty(value = "修改时间")
private Date updateTime;
-
}
diff --git a/src/main/java/com/gxwebsoft/cms/entity/Follow.java b/src/main/java/com/gxwebsoft/cms/entity/Follow.java
new file mode 100644
index 0000000..9380b59
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/entity/Follow.java
@@ -0,0 +1,56 @@
+package com.gxwebsoft.cms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 关注
+ *
+ * @author 科技小王子
+ * @since 2024-12-11 18:25:28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "Follow对象", description = "关注")
+@TableName("cms_follow")
+public class Follow implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ private Integer userId;
+
+ private Integer followUserId;
+
+ @ApiModelProperty(value = "排序(数字越小越靠前)")
+ private Integer sortNumber;
+
+ @ApiModelProperty(value = "备注")
+ private String comments;
+
+ @ApiModelProperty(value = "状态, 0已发布, 1待审核 2已驳回 3违规内容")
+ private Integer status;
+
+ @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @TableLogic
+ private Integer deleted;
+
+ @ApiModelProperty(value = "租户id")
+ private Integer tenantId;
+
+ @ApiModelProperty(value = "创建时间")
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "修改时间")
+ private LocalDateTime updateTime;
+
+}
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/ArticleCheckMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/ArticleCheckMapper.java
new file mode 100644
index 0000000..4ca8500
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/mapper/ArticleCheckMapper.java
@@ -0,0 +1,37 @@
+package com.gxwebsoft.cms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.cms.entity.ArticleCheck;
+import com.gxwebsoft.cms.param.ArticleCheckParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * Mapper
+ *
+ * @author 科技小王子
+ * @since 2024-11-19 22:01:03
+ */
+public interface ArticleCheckMapper extends BaseMapper {
+
+ /**
+ * 分页查询
+ *
+ * @param page 分页对象
+ * @param param 查询参数
+ * @return List
+ */
+ List selectPageRel(@Param("page") IPage page,
+ @Param("param") ArticleCheckParam param);
+
+ /**
+ * 查询全部
+ *
+ * @param param 查询参数
+ * @return List
+ */
+ List selectListRel(@Param("param") ArticleCheckParam param);
+
+}
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/FollowMapper.java b/src/main/java/com/gxwebsoft/cms/mapper/FollowMapper.java
new file mode 100644
index 0000000..4a6b2de
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/mapper/FollowMapper.java
@@ -0,0 +1,37 @@
+package com.gxwebsoft.cms.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.cms.entity.Follow;
+import com.gxwebsoft.cms.param.FollowParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 关注Mapper
+ *
+ * @author 科技小王子
+ * @since 2024-12-11 18:25:28
+ */
+public interface FollowMapper extends BaseMapper {
+
+ /**
+ * 分页查询
+ *
+ * @param page 分页对象
+ * @param param 查询参数
+ * @return List
+ */
+ List selectPageRel(@Param("page") IPage page,
+ @Param("param") FollowParam param);
+
+ /**
+ * 查询全部
+ *
+ * @param param 查询参数
+ * @return List
+ */
+ List selectListRel(@Param("param") FollowParam param);
+
+}
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCheckMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCheckMapper.xml
new file mode 100644
index 0000000..b23403b
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleCheckMapper.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+ SELECT a.*
+ FROM cms_article_check a
+
+
+ AND a.id = #{param.id}
+
+
+ AND a.article_id = #{param.articleId}
+
+
+ AND a.user_id = #{param.userId}
+
+
+ AND a.status = #{param.status}
+
+
+ AND a.sort_number = #{param.sortNumber}
+
+
+ AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
+
+
+ AND a.deleted = #{param.deleted}
+
+
+ AND a.deleted = 0
+
+
+ AND a.create_time >= #{param.createTimeStart}
+
+
+ AND a.create_time <= #{param.createTimeEnd}
+
+
+ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
+ )
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleMapper.xml
index 2a8510e..db2ea26 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleMapper.xml
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/ArticleMapper.xml
@@ -30,6 +30,9 @@
AND a.image LIKE CONCAT('%', #{param.image}, '%')
+
+ AND a.image LIKE '%.mp4%'
+
AND a.source LIKE CONCAT('%', #{param.source}, '%')
diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/FollowMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/FollowMapper.xml
new file mode 100644
index 0000000..89ab191
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/FollowMapper.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+ SELECT a.*
+ FROM cms_follow a
+
+
+ AND a.id = #{param.id}
+
+
+ AND a.user_id = #{param.userId}
+
+
+ AND a.follow_user_id = #{param.followUserId}
+
+
+ AND a.sort_number = #{param.sortNumber}
+
+
+ AND a.comments LIKE CONCAT('%', #{param.comments}, '%')
+
+
+ AND a.status = #{param.status}
+
+
+ AND a.deleted = #{param.deleted}
+
+
+ AND a.deleted = 0
+
+
+ AND a.create_time >= #{param.createTimeStart}
+
+
+ AND a.create_time <= #{param.createTimeEnd}
+
+
+ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
+ )
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/gxwebsoft/cms/param/ArticleCheckParam.java b/src/main/java/com/gxwebsoft/cms/param/ArticleCheckParam.java
new file mode 100644
index 0000000..9e52529
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/param/ArticleCheckParam.java
@@ -0,0 +1,54 @@
+package com.gxwebsoft.cms.param;
+
+import java.math.BigDecimal;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.gxwebsoft.cms.entity.Article;
+import com.gxwebsoft.common.core.annotation.QueryField;
+import com.gxwebsoft.common.core.annotation.QueryType;
+import com.gxwebsoft.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 查询参数
+ *
+ * @author 科技小王子
+ * @since 2024-11-19 22:01:03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@ApiModel(value = "ArticleCheckParam对象", description = "查询参数")
+public class ArticleCheckParam extends BaseParam {
+ private static final long serialVersionUID = 1L;
+
+ @QueryField(type = QueryType.EQ)
+ private Integer id;
+
+ @ApiModelProperty(value = "文章ID")
+ @QueryField(type = QueryType.EQ)
+ private Integer articleId;
+
+ @QueryField(type = QueryType.EQ)
+ private Integer userId;
+
+ @ApiModelProperty(value = "0待审核1通过2拒绝")
+ @QueryField(type = QueryType.EQ)
+ private Integer status;
+
+ @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @QueryField(type = QueryType.EQ)
+ private Integer sortNumber;
+
+ @ApiModelProperty(value = "备注")
+ private String comments;
+
+ @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @QueryField(type = QueryType.EQ)
+ private Integer deleted;
+
+}
diff --git a/src/main/java/com/gxwebsoft/cms/param/ArticleParam.java b/src/main/java/com/gxwebsoft/cms/param/ArticleParam.java
index 417232e..acf908d 100644
--- a/src/main/java/com/gxwebsoft/cms/param/ArticleParam.java
+++ b/src/main/java/com/gxwebsoft/cms/param/ArticleParam.java
@@ -1,5 +1,6 @@
package com.gxwebsoft.cms.param;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.gxwebsoft.common.core.annotation.QueryField;
import com.gxwebsoft.common.core.annotation.QueryType;
import com.gxwebsoft.common.core.web.BaseParam;
@@ -125,4 +126,21 @@ public class ArticleParam extends BaseParam {
@QueryField(type = QueryType.EQ)
private Integer deleted;
+ @TableField(exist = false)
+ private Integer loginUserId;
+
+ @TableField(exist = false)
+ private Boolean hasFollow;
+
+ @TableField(exist = false)
+ private Boolean followOnly;
+
+ @TableField(exist = false)
+ private Boolean minData;
+
+ @TableField(exist = false)
+ private Boolean videoOnly;
+
+ @TableField(exist = false)
+ private Integer includeId;
}
diff --git a/src/main/java/com/gxwebsoft/cms/param/FollowParam.java b/src/main/java/com/gxwebsoft/cms/param/FollowParam.java
new file mode 100644
index 0000000..c5ee411
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/param/FollowParam.java
@@ -0,0 +1,50 @@
+package com.gxwebsoft.cms.param;
+
+import java.math.BigDecimal;
+import com.gxwebsoft.common.core.annotation.QueryField;
+import com.gxwebsoft.common.core.annotation.QueryType;
+import com.gxwebsoft.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 关注查询参数
+ *
+ * @author 科技小王子
+ * @since 2024-12-11 18:25:28
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@ApiModel(value = "FollowParam对象", description = "关注查询参数")
+public class FollowParam extends BaseParam {
+ private static final long serialVersionUID = 1L;
+
+ @QueryField(type = QueryType.EQ)
+ private Integer id;
+
+ @QueryField(type = QueryType.EQ)
+ private Integer userId;
+
+ @QueryField(type = QueryType.EQ)
+ private Integer followUserId;
+
+ @ApiModelProperty(value = "排序(数字越小越靠前)")
+ @QueryField(type = QueryType.EQ)
+ private Integer sortNumber;
+
+ @ApiModelProperty(value = "备注")
+ private String comments;
+
+ @ApiModelProperty(value = "状态, 0已发布, 1待审核 2已驳回 3违规内容")
+ @QueryField(type = QueryType.EQ)
+ private Integer status;
+
+ @ApiModelProperty(value = "是否删除, 0否, 1是")
+ @QueryField(type = QueryType.EQ)
+ private Integer deleted;
+
+}
diff --git a/src/main/java/com/gxwebsoft/cms/service/ArticleCheckService.java b/src/main/java/com/gxwebsoft/cms/service/ArticleCheckService.java
new file mode 100644
index 0000000..788dd3b
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/service/ArticleCheckService.java
@@ -0,0 +1,43 @@
+package com.gxwebsoft.cms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.cms.entity.ArticleCheck;
+import com.gxwebsoft.cms.param.ArticleCheckParam;
+
+import java.util.List;
+
+/**
+ * Service
+ *
+ * @author 科技小王子
+ * @since 2024-11-19 22:01:03
+ */
+public interface ArticleCheckService extends IService {
+
+ /**
+ * 分页关联查询
+ *
+ * @param param 查询参数
+ * @return PageResult
+ */
+ PageResult pageRel(ArticleCheckParam param);
+
+ /**
+ * 关联查询全部
+ *
+ * @param param 查询参数
+ * @return List
+ */
+ List listRel(ArticleCheckParam param);
+
+ /**
+ * 根据id查询
+ *
+ * @param id
+ * @return ArticleCheck
+ */
+ ArticleCheck getByIdRel(Integer id);
+
+ List listByArticleId(Integer articleId);
+}
diff --git a/src/main/java/com/gxwebsoft/cms/service/ArticleService.java b/src/main/java/com/gxwebsoft/cms/service/ArticleService.java
index 65eb3c6..de2a459 100644
--- a/src/main/java/com/gxwebsoft/cms/service/ArticleService.java
+++ b/src/main/java/com/gxwebsoft/cms/service/ArticleService.java
@@ -31,6 +31,10 @@ public interface ArticleService extends IService {
*/
List listRel(ArticleParam param);
+ PageResult pageMinData(ArticleParam param);
+
+ List listMinData(ArticleParam param);
+
/**
* 根据id查询
*
diff --git a/src/main/java/com/gxwebsoft/cms/service/FollowService.java b/src/main/java/com/gxwebsoft/cms/service/FollowService.java
new file mode 100644
index 0000000..d699d2e
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/service/FollowService.java
@@ -0,0 +1,45 @@
+package com.gxwebsoft.cms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.cms.entity.Follow;
+import com.gxwebsoft.cms.param.FollowParam;
+
+import java.util.List;
+
+/**
+ * 关注Service
+ *
+ * @author 科技小王子
+ * @since 2024-12-11 18:25:28
+ */
+public interface FollowService extends IService {
+
+ /**
+ * 分页关联查询
+ *
+ * @param param 查询参数
+ * @return PageResult
+ */
+ PageResult pageRel(FollowParam param);
+
+ /**
+ * 关联查询全部
+ *
+ * @param param 查询参数
+ * @return List
+ */
+ List listRel(FollowParam param);
+
+ /**
+ * 根据id查询
+ *
+ * @param id
+ * @return Follow
+ */
+ Follow getByIdRel(Integer id);
+
+ Follow check(Integer userId, Integer followUserId);
+
+ Integer countByFollowUser(Integer followUserId);
+}
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCheckServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCheckServiceImpl.java
new file mode 100644
index 0000000..739934b
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleCheckServiceImpl.java
@@ -0,0 +1,56 @@
+package com.gxwebsoft.cms.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.cms.mapper.ArticleCheckMapper;
+import com.gxwebsoft.cms.service.ArticleCheckService;
+import com.gxwebsoft.cms.entity.ArticleCheck;
+import com.gxwebsoft.cms.param.ArticleCheckParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Service实现
+ *
+ * @author 科技小王子
+ * @since 2024-11-19 22:01:03
+ */
+@Service
+public class ArticleCheckServiceImpl extends ServiceImpl implements ArticleCheckService {
+
+ @Override
+ public PageResult pageRel(ArticleCheckParam param) {
+ PageParam page = new PageParam<>(param);
+ page.setDefaultOrder("sort_number asc, create_time desc");
+ List list = baseMapper.selectPageRel(page, param);
+ return new PageResult<>(list, page.getTotal());
+ }
+
+ @Override
+ public List listRel(ArticleCheckParam param) {
+ List list = baseMapper.selectListRel(param);
+ // 排序
+ PageParam page = new PageParam<>();
+ page.setDefaultOrder("sort_number asc, create_time desc");
+ return page.sortRecords(list);
+ }
+
+ @Override
+ public ArticleCheck getByIdRel(Integer id) {
+ ArticleCheckParam param = new ArticleCheckParam();
+ param.setId(id);
+ return param.getOne(baseMapper.selectListRel(param));
+ }
+
+ @Override
+ public List listByArticleId(Integer articleId) {
+ return list(
+ new LambdaQueryWrapper()
+ .eq(ArticleCheck::getArticleId, articleId)
+ );
+ }
+
+}
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java
index deea5ff..e6a92ff 100644
--- a/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/ArticleServiceImpl.java
@@ -1,15 +1,26 @@
package com.gxwebsoft.cms.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.cms.entity.ArticleLike;
+import com.gxwebsoft.cms.entity.Follow;
import com.gxwebsoft.cms.mapper.ArticleMapper;
+import com.gxwebsoft.cms.param.ArticleLikeParam;
+import com.gxwebsoft.cms.param.FollowParam;
+import com.gxwebsoft.cms.service.ArticleLikeService;
import com.gxwebsoft.cms.service.ArticleService;
import com.gxwebsoft.cms.entity.Article;
import com.gxwebsoft.cms.param.ArticleParam;
+import com.gxwebsoft.cms.service.FollowService;
import com.gxwebsoft.common.core.web.PageParam;
import com.gxwebsoft.common.core.web.PageResult;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 文章Service实现
@@ -19,6 +30,10 @@ import java.util.List;
*/
@Service
public class ArticleServiceImpl extends ServiceImpl implements ArticleService {
+ @Resource
+ private FollowService followService;
+ @Resource
+ private ArticleLikeService articleLikeService;
@Override
public PageResult pageRel(ArticleParam param) {
@@ -30,13 +45,113 @@ public class ArticleServiceImpl extends ServiceImpl impl
@Override
public List listRel(ArticleParam param) {
+ List listInFollow = new ArrayList<>();
+ if (param.getFollowOnly() != null && param.getLoginUserId() != null) {
+ List followList = followService.listRel(new FollowParam() {{
+ setUserId(param.getLoginUserId());
+ }});
+ listInFollow = list(
+ new LambdaQueryWrapper()
+ .in(Article::getUserId, followList.stream().map(Follow::getFollowUserId).toList())
+ );
+ if (!listInFollow.isEmpty()) {
+ for (Article article : listInFollow) {
+ article.setHasFollow(true);
+ }
+ return listInFollow;
+ }
+ }
List list = baseMapper.selectListRel(param);
// 排序
PageParam page = new PageParam<>();
page.setDefaultOrder("sort_number asc, create_time desc");
+ if (param.getLoginUserId() != null) {
+ List followList = followService.listRel(new FollowParam() {{
+ setUserId(param.getLoginUserId());
+ }});
+ List likeList = articleLikeService.listRel(new ArticleLikeParam() {{
+ setUserId(param.getLoginUserId());
+ }});
+ for (Article article : list) {
+ article.setFansNum(followService.countByFollowUser(article.getUserId()));
+ article.setHasFollow(false);
+ if (!followList.isEmpty()) {
+ for (Follow follow : followList) {
+ if (article.getUserId().equals(follow.getFollowUserId())) {
+ article.setHasFollow(true);
+ }
+ }
+ }
+ article.setHasLike(false);
+ if (!likeList.isEmpty()) {
+ for (ArticleLike articleLike : likeList) {
+ if (article.getArticleId().equals(articleLike.getArticleId())) {
+ article.setHasLike(true);
+ }
+ }
+ }
+
+ }
+ } else {
+ for (Article article : list) {
+ article.setFansNum(followService.countByFollowUser(article.getUserId()));
+ }
+ }
+
return page.sortRecords(list);
}
+ @Override
+ public PageResult pageMinData(ArticleParam param) {
+ PageResult list = pageRel(param);
+ List> minDataList = new ArrayList<>();
+ for (Article article : list.getList()) {
+ minDataList.add(setData(article));
+ }
+ if (param.getIncludeId() != null) {
+ Article article = getByIdRel(param.getIncludeId());
+ if (article != null) {
+ minDataList.add(setData(article));
+ }
+ }
+ PageResult> pageResult = new PageResult<>();
+ pageResult.setList(minDataList);
+ pageResult.setCount(list.getCount());
+ return pageResult;
+ }
+
+ @Override
+ public List listMinData(ArticleParam param) {
+ List list = listRel(param);
+ List> minDataList = new ArrayList<>();
+ for (Article article : list) {
+ minDataList.add(setData(article));
+ }
+ return minDataList;
+ }
+
+ private Map setData(Article article){
+ Map data = new HashMap<>();
+ data.put("articleId", article.getArticleId());
+ data.put("hasFollow", article.getHasFollow());
+ data.put("imageWidth", article.getImageWidth());
+ data.put("imageHeight", article.getImageHeight());
+ data.put("username", article.getUsername());
+ data.put("title", article.getTitle());
+ data.put("userAvatar", article.getUserAvatar());
+ data.put("actualViews", article.getActualViews());
+ data.put("commentNumbers", article.getCommentNumbers());
+ data.put("cover", article.getCover());
+ data.put("image", article.getImage());
+ data.put("shareCover", article.getShareCover());
+ data.put("likes", article.getLikes());
+ data.put("hasLike", article.getHasLike());
+ data.put("fansNum", article.getFansNum());
+ data.put("userId", article.getUserId());
+ data.put("video", article.getVideo());
+ return data;
+ }
+
@Override
public Article getByIdRel(Integer articleId) {
ArticleParam param = new ArticleParam();
diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/FollowServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/FollowServiceImpl.java
new file mode 100644
index 0000000..ab1aaa2
--- /dev/null
+++ b/src/main/java/com/gxwebsoft/cms/service/impl/FollowServiceImpl.java
@@ -0,0 +1,64 @@
+package com.gxwebsoft.cms.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.cms.mapper.FollowMapper;
+import com.gxwebsoft.cms.service.FollowService;
+import com.gxwebsoft.cms.entity.Follow;
+import com.gxwebsoft.cms.param.FollowParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 关注Service实现
+ *
+ * @author 科技小王子
+ * @since 2024-12-11 18:25:28
+ */
+@Service
+public class FollowServiceImpl extends ServiceImpl implements FollowService {
+
+ @Override
+ public PageResult pageRel(FollowParam param) {
+ PageParam page = new PageParam<>(param);
+ page.setDefaultOrder("sort_number asc, create_time desc");
+ List list = baseMapper.selectPageRel(page, param);
+ return new PageResult<>(list, page.getTotal());
+ }
+
+ @Override
+ public List listRel(FollowParam param) {
+ List list = baseMapper.selectListRel(param);
+ // 排序
+ PageParam page = new PageParam<>();
+ page.setDefaultOrder("sort_number asc, create_time desc");
+ return page.sortRecords(list);
+ }
+
+ @Override
+ public Follow getByIdRel(Integer id) {
+ FollowParam param = new FollowParam();
+ param.setId(id);
+ return param.getOne(baseMapper.selectListRel(param));
+ }
+
+ @Override
+ public Follow check(Integer userId, Integer followUserId) {
+ FollowParam param = new FollowParam();
+ param.setUserId(userId);
+ param.setFollowUserId(followUserId);
+ return param.getOne(baseMapper.selectListRel(param));
+ }
+
+ @Override
+ public Integer countByFollowUser(Integer followUserId) {
+ return count(
+ new LambdaQueryWrapper()
+ .eq(Follow::getFollowUserId, followUserId)
+ );
+ }
+
+}
diff --git a/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java b/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java
index fefe1c7..51d2ba0 100644
--- a/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java
+++ b/src/main/java/com/gxwebsoft/common/core/aspect/OperationLogAspect.java
@@ -148,7 +148,7 @@ public class OperationLogAspect {
if (subject != null) {
Object object = subject.getPrincipal();
if (object instanceof User) {
- System.out.println("(User) object = " + (User) object);
+// System.out.println("(User) object = " + (User) object);
return (User) object;
}
}
diff --git a/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationFilter.java b/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationFilter.java
index 7dd44f7..51c049a 100644
--- a/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationFilter.java
+++ b/src/main/java/com/gxwebsoft/common/core/security/JwtAuthenticationFilter.java
@@ -78,6 +78,9 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter {
}
final String data = jsonObject.getString("data");
final User user = JSONObject.parseObject(data, User.class);
+ if (user != null && user.getStatus().equals(1)) {
+ throw new UsernameNotFoundException("该账号已被禁用");
+ }
List