From ebe1440caecb571988c6b97564b770960adf910e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 18 Jan 2022 09:07:30 +0800
Subject: [PATCH] 1敏感词限制
---
src/main/java/org/springblade/modules/mgcx/mapper/MgcxMapper.java | 3 +
src/main/java/org/springblade/modules/integral/entity/Integral.java | 4 +
src/main/java/org/springblade/modules/mgcx/service/IMgcxService.java | 3
src/main/java/org/springblade/modules/integral/controller/IntegralController.java | 17 +++++
src/main/java/org/springblade/modules/mgcx/mapper/MgcxMapper.xml | 8 ++
src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java | 5 +
src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java | 3
src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml | 9 ++
src/main/java/org/springblade/modules/integral/service/IIntegralService.java | 5 +
src/main/java/org/springblade/modules/article/controller/ArticleController.java | 90 +++++++++++++++--------------
src/main/java/org/springblade/modules/mgcx/service/impl/MgcxServiceImpl.java | 10 +++
src/main/java/org/springblade/modules/mgcx/controller/MgcxController.java | 11 +++
12 files changed, 117 insertions(+), 51 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 3473911..da2609b 100644
--- a/src/main/java/org/springblade/modules/article/controller/ArticleController.java
+++ b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -41,92 +41,93 @@
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){
+ 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));
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ return R.data(articleService.pageWords(Condition.getPage(query), article));
}
/**
- *
* 查询资讯分页信息(角色权限)
+ *
* @param response
- * @param article 资讯对象
- * @param query 查询参数
+ * @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){
+ 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));
+ 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){
+ 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));
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ return R.data(articleService.pageCollect(Condition.getPage(query), article));
}
/**
* 资讯详情
- * @param article 资讯查询对象
+ *
+ * @param article 资讯查询对象
* @param response
*/
@GetMapping("/detail")
@@ -135,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")
@@ -153,6 +155,7 @@
/**
* 修改资讯信息
+ *
* @param article 资讯对象
*/
@PostMapping("/update")
@@ -164,25 +167,26 @@
/**
* 新增或修改资讯信息
+ *
* @param article 资讯对象信息
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入article")
public R submit(@Valid @RequestBody ArticleVo article) {
- if (null==article.getId()){
- if (null==article.getCreateTime()){
+ 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();
+ 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"){
+ if (content.get("iswords") == "true") {
article.setContent(content.get("content"));
article.setIswords("1");
article.setWordsContent(content.get("words"));
@@ -194,15 +198,14 @@
Mgcx mgcx = new Mgcx();
mgcx.setUid(userid);
Mgcx one = mgcxService.getOne(Condition.getQueryWrapper(mgcx));
- if (one==null){
+ if (one == null) {
mgcx.setUid(userid);
mgcx.setPhone(detail.getPhone());
mgcx.setCardid(detail.getCardid());
- mgcx.setCountx(10);
+ mgcx.setCountx(mgcxService.sel());
mgcx.setCounts(1);
mgcxService.save(mgcx);
- }
- else {
+ } else {
Integer counts = one.getCounts();
int i = counts + 1;
one.setCounts(i);
@@ -219,6 +222,7 @@
/**
* 删除资讯信息
+ *
* @param ids 资讯主键id,id集合
*/
@PostMapping("/remove")
@@ -232,13 +236,13 @@
* 批量修改评论区状态
*/
@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));
}
}
diff --git a/src/main/java/org/springblade/modules/integral/controller/IntegralController.java b/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
index 67474a2..f152785 100644
--- a/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
+++ b/src/main/java/org/springblade/modules/integral/controller/IntegralController.java
@@ -21,6 +21,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
import lombok.AllArgsConstructor;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
@@ -33,6 +34,9 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 控制器
@@ -131,8 +135,17 @@
*/
@PostMapping("/selectCount")
public R selectCount(String uid) {
- return R.data(integralService.selectCount(uid));
+ List<Map<Object, Object>> list = integralService.selectCount(uid);
+ Map map = new HashMap();
+ Integer a = Integer.parseInt(list.get(0).get("integral").toString());
+ Integer b = Integer.parseInt(list.get(1).get("integral").toString());
+ //总积分
+ map.put("zjf", list.get(0));
+ //总的用掉的积分
+ map.put("yjf", list.get(1));
+ //剩余积分
+ map.put("sjf", a - b);
+ return R.data(map);
}
-
}
diff --git a/src/main/java/org/springblade/modules/integral/entity/Integral.java b/src/main/java/org/springblade/modules/integral/entity/Integral.java
index 6488fca..0686472 100644
--- a/src/main/java/org/springblade/modules/integral/entity/Integral.java
+++ b/src/main/java/org/springblade/modules/integral/entity/Integral.java
@@ -63,6 +63,10 @@
*/
@ApiModelProperty(value = "积分")
private Integer integral;
+ /**
+ * 类型
+ */
+ private String type;
}
diff --git a/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java b/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java
index 01efffa..dee9173 100644
--- a/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java
+++ b/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.java
@@ -22,6 +22,7 @@
import org.springblade.modules.integral.vo.IntegralVO;
import java.util.List;
+import java.util.Map;
/**
* Mapper 接口
@@ -39,5 +40,5 @@
* @return
*/
List<IntegralVO> selectIntegralPage(IPage page, IntegralVO integral);
- String selectCount(String uid);
+ List<Map<Object, Object>> selectCount(String uid);
}
diff --git a/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml b/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml
index 495b51a..930d08a 100644
--- a/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml
+++ b/src/main/java/org/springblade/modules/integral/mapper/IntegralMapper.xml
@@ -18,9 +18,14 @@
where is_deleted = 0
</select>
- <select id="selectCount" resultType="java.lang.String">
+ <select id="selectCount" resultType="java.util.HashMap">
SELECT COALESCE(sum(integral), 0) as integral
- FROM sys_integral where uid=#{uid}
+ FROM sys_integral
+ WHERE type = 1 AND uid=#{uid}
+ UNION ALL
+ SELECT COALESCE(sum(integral), 0) AS integral
+ FROM sys_integral
+ WHERE type = 2 AND uid=#{uid}
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/integral/service/IIntegralService.java b/src/main/java/org/springblade/modules/integral/service/IIntegralService.java
index 54842a1..1c82deb 100644
--- a/src/main/java/org/springblade/modules/integral/service/IIntegralService.java
+++ b/src/main/java/org/springblade/modules/integral/service/IIntegralService.java
@@ -21,6 +21,9 @@
import org.springblade.modules.integral.entity.Integral;
import org.springblade.modules.integral.vo.IntegralVO;
+import java.util.List;
+import java.util.Map;
+
/**
* 服务类
*
@@ -37,5 +40,5 @@
* @return
*/
IPage<IntegralVO> selectIntegralPage(IPage<IntegralVO> page, IntegralVO integral);
- String selectCount(String uid);
+ List<Map<Object, Object>> selectCount(String uid);
}
diff --git a/src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java b/src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java
index 73b0a9c..88dcc01 100644
--- a/src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java
+++ b/src/main/java/org/springblade/modules/integral/service/impl/IntegralServiceImpl.java
@@ -24,6 +24,9 @@
import org.springblade.modules.integral.vo.IntegralVO;
import org.springframework.stereotype.Service;
+import java.util.List;
+import java.util.Map;
+
/**
* 服务实现类
*
@@ -39,7 +42,7 @@
}
@Override
- public String selectCount(String uid) {
+ public List<Map<Object, Object>> selectCount(String uid) {
return baseMapper.selectCount(uid);
}
diff --git a/src/main/java/org/springblade/modules/mgcx/controller/MgcxController.java b/src/main/java/org/springblade/modules/mgcx/controller/MgcxController.java
index a114f1c..e0782c2 100644
--- a/src/main/java/org/springblade/modules/mgcx/controller/MgcxController.java
+++ b/src/main/java/org/springblade/modules/mgcx/controller/MgcxController.java
@@ -123,4 +123,15 @@
return R.status(mgcxService.removeByIds(Func.toLongList(ids)));
}
+ @PostMapping("/updateval")
+ public R updateval(@ApiParam int val) {
+ mgcxService.update(val);
+ return R.success("修改成功");
+ }
+
+ @PostMapping("/sel")
+ public R sel() {
+ return R.data(mgcxService.sel());
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/mgcx/mapper/MgcxMapper.java b/src/main/java/org/springblade/modules/mgcx/mapper/MgcxMapper.java
index ca1d5e5..2c9cafb 100644
--- a/src/main/java/org/springblade/modules/mgcx/mapper/MgcxMapper.java
+++ b/src/main/java/org/springblade/modules/mgcx/mapper/MgcxMapper.java
@@ -40,4 +40,7 @@
*/
List<MgcxVO> selectMgcxPage(IPage page, MgcxVO mgcx);
+ void update(int val);
+ int sel();
+
}
diff --git a/src/main/java/org/springblade/modules/mgcx/mapper/MgcxMapper.xml b/src/main/java/org/springblade/modules/mgcx/mapper/MgcxMapper.xml
index bcacac5..b399b2c 100644
--- a/src/main/java/org/springblade/modules/mgcx/mapper/MgcxMapper.xml
+++ b/src/main/java/org/springblade/modules/mgcx/mapper/MgcxMapper.xml
@@ -17,4 +17,12 @@
select * from sys_mgcx where is_deleted = 0
</select>
+ <update id="update">
+ update sys_valmgcx set value=#{val} where id=1
+ </update>
+
+ <select id="sel" resultType="java.lang.Integer">
+ select value from sys_valmgcx where id=1
+ </select>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/mgcx/service/IMgcxService.java b/src/main/java/org/springblade/modules/mgcx/service/IMgcxService.java
index 3754305..59014a5 100644
--- a/src/main/java/org/springblade/modules/mgcx/service/IMgcxService.java
+++ b/src/main/java/org/springblade/modules/mgcx/service/IMgcxService.java
@@ -37,5 +37,6 @@
* @return
*/
IPage<MgcxVO> selectMgcxPage(IPage<MgcxVO> page, MgcxVO mgcx);
-
+ void update(int val);
+ int sel();
}
diff --git a/src/main/java/org/springblade/modules/mgcx/service/impl/MgcxServiceImpl.java b/src/main/java/org/springblade/modules/mgcx/service/impl/MgcxServiceImpl.java
index ca4f0a8..6096069 100644
--- a/src/main/java/org/springblade/modules/mgcx/service/impl/MgcxServiceImpl.java
+++ b/src/main/java/org/springblade/modules/mgcx/service/impl/MgcxServiceImpl.java
@@ -38,4 +38,14 @@
return page.setRecords(baseMapper.selectMgcxPage(page, mgcx));
}
+ @Override
+ public void update(int val) {
+ baseMapper.update(val);
+ }
+
+ @Override
+ public int sel() {
+ return baseMapper.sel();
+ }
+
}
--
Gitblit v1.9.3