From 4310c19a73f960dfd79c90cfe960cf564b068f72 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 May 2022 10:03:35 +0800
Subject: [PATCH] 1、资讯模糊匹配修改
---
src/main/java/org/springblade/modules/article/controller/ArticleController.java | 157 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 129 insertions(+), 28 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/controller/ArticleController.java b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
index 40077e3..3b03c2d 100644
--- a/src/main/java/org/springblade/modules/article/controller/ArticleController.java
+++ b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -7,18 +7,25 @@
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.article.entity.Article;
import org.springblade.modules.article.service.ArticleService;
import org.springblade.modules.article.vo.ArticleVo;
+import org.springblade.modules.mgcx.entity.Mgcx;
+import org.springblade.modules.mgcx.service.IMgcxService;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.words.DemoApplication;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
/**
* @author zhongrj
@@ -30,59 +37,97 @@
public class ArticleController {
private final ArticleService articleService;
-
+ private final IUserService userService;
+ private final IMgcxService mgcxService;
/**
- *
* 查询资讯分页信息
+ *
* @param response
- * @param article 资讯对象
- * @param query 查询参数
+ * @param article 资讯对象
+ * @param query 查询参数
* @return
*/
@GetMapping("/page")
- public R<IPage<Article>> page(HttpServletResponse response, ArticleVo article, Query query){
+ public R<IPage<Article>> page(HttpServletResponse response, ArticleVo article, Query query) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
- return R.data(articleService.selectArticlePage(Condition.getPage(query),article));
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ return R.data(articleService.selectArticlePage(Condition.getPage(query), article));
}
/**
+ * 敏感词预警
*
- * 查询资讯分页信息(角色权限)
* @param response
- * @param article 资讯对象
- * @param query 查询参数
+ * @param article 资讯对象
+ * @param query 查询参数
+ * @return
+ */
+ @GetMapping("/pageWords")
+ public R<IPage<Article>> pageWords(HttpServletResponse response, ArticleVo article, Query query) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ return R.data(articleService.pageWords(Condition.getPage(query), article));
+ }
+
+ /**
+ * 查询资讯分页信息(角色权限)
+ *
+ * @param response
+ * @param article 资讯对象
+ * @param query 查询参数
* @return
*/
@GetMapping("/pageDate")
- public R<IPage<Article>> pageDate(HttpServletResponse response, ArticleVo article, Query query){
+ public R<IPage<Article>> pageDate(HttpServletResponse response, ArticleVo article, Query query) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
- return R.data(articleService.pageDate(Condition.getPage(query),article));
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ return R.data(articleService.pageDate(Condition.getPage(query), article));
+ }
+
+ @GetMapping("/pageCollectList")
+ public R<IPage<Article>> pageCollectList(HttpServletResponse response, ArticleVo article, Query query) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ return R.data(articleService.pageCollectList(Condition.getPage(query), article));
}
/**
- *
* 查询资讯分页信息(角色权限)附带点赞评论数
+ *
* @param response
- * @param article 资讯对象
- * @param query 查询参数
+ * @param article 资讯对象
+ * @param query 查询参数
* @return
*/
@GetMapping("/pageLikes")
- public R<IPage<Article>> pageLikes(HttpServletResponse response, ArticleVo article, Query query){
+ public R<IPage<Article>> pageLikes(HttpServletResponse response, ArticleVo article, Query query) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
- return R.data(articleService.pageLikes(Condition.getPage(query),article));
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ return R.data(articleService.pageLikes(Condition.getPage(query), article));
}
/**
+ * 查询已收藏的资讯
+ */
+ @GetMapping("/pageCollect")
+ public R<IPage<Article>> pageCollect(HttpServletResponse response, ArticleVo article, Query query) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ return R.data(articleService.pageCollect(Condition.getPage(query), article));
+ }
+
+
+ /**
* 资讯详情
- * @param article 资讯查询对象
+ *
+ * @param article 资讯查询对象
* @param response
*/
@GetMapping("/detail")
@@ -91,13 +136,14 @@
public R<Article> detail(Article article, HttpServletResponse response) {
response.setHeader("Access-Control-Allow-Origin", "*");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
Article detail = articleService.getOne(Condition.getQueryWrapper(article));
return R.data(detail);
}
/**
* 新增资讯信息
+ *
* @param article 资讯对象
*/
@PostMapping("/save")
@@ -109,6 +155,7 @@
/**
* 修改资讯信息
+ *
* @param article 资讯对象
*/
@PostMapping("/update")
@@ -120,16 +167,53 @@
/**
* 新增或修改资讯信息
+ *
* @param article 资讯对象信息
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入article")
- public R submit(@Valid @RequestBody Article article) {
- if (null==article.getId()){
- if (null==article.getCreateTime()){
+ public R submit(@Valid @RequestBody ArticleVo article) {
+ if (null == article.getId()) {
+ if (null == article.getCreateTime()) {
article.setCreateTime(new Date());
}
+ }
+ //默认为正常
+ article.setIswords("0");
+
+ if (article.getContent() != null && article.getContent() != "") {
+ Map<String, String> content = new HashMap();
+ content = DemoApplication.interceptWords(article.getContent());
+ System.out.println(content.get("iswords"));
+ if (content.get("iswords") == "true") {
+ article.setContent(content.get("content"));
+ article.setIswords("1");
+ article.setWordsContent(content.get("words"));
+ //获取登录信息
+ String userid = article.getUserid();
+ User user = new User();
+ user.setId(Long.parseLong(userid));
+ User detail = userService.getOne(Condition.getQueryWrapper(user));
+ Mgcx mgcx = new Mgcx();
+ mgcx.setUid(userid);
+ Mgcx one = mgcxService.getOne(Condition.getQueryWrapper(mgcx));
+ if (one == null) {
+ mgcx.setUid(userid);
+ mgcx.setPhone(detail.getPhone());
+ mgcx.setCardid(detail.getCardid());
+ mgcx.setCountx(mgcxService.sel());
+ mgcx.setCounts(1);
+ mgcxService.save(mgcx);
+ } else {
+ Integer counts = one.getCounts();
+ int i = counts + 1;
+ one.setCounts(i);
+ mgcxService.updateById(one);
+ }
+
+ }
+
}
article.setUpdateTime(new Date());
return R.status(articleService.saveOrUpdate(article));
@@ -138,6 +222,7 @@
/**
* 删除资讯信息
+ *
* @param ids 资讯主键id,id集合
*/
@PostMapping("/remove")
@@ -151,13 +236,29 @@
* 批量修改评论区状态
*/
@PostMapping("/upcomment")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids,String type) {
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, String type) {
String[] split = ids.split(",");
String strArrays = "";
for (int i = 0; i < split.length; i++) {
strArrays += "'" + split[i] + "',";
}
String code = strArrays.substring(0, strArrays.length() - 1);
- return R.status(articleService.upcomment(code,type));
+ return R.status(articleService.upcomment(code, type));
+ }
+
+ /**
+ * 查询个人资讯
+ *
+ * @param response
+ * @param article
+ * @param query
+ * @return
+ */
+ @GetMapping("/selectArticleG")
+ public R<IPage<Article>> selectArticleG(HttpServletResponse response, ArticleVo article, Query query) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ return R.data(articleService.selectArticleG(Condition.getPage(query), article));
}
}
--
Gitblit v1.9.3