From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/article/entity/Article.java | 7 +++++--
src/main/java/org/springblade/modules/article/entity/ArticleIntegralEntity.java | 6 ++++++
src/main/java/org/springblade/modules/article/controller/ArticleController.java | 6 +++---
src/main/java/org/springblade/modules/article/service/ArticleService.java | 10 ++++++++++
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 31 +++++++++++++++++++++++++++++++
5 files changed, 55 insertions(+), 5 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 b9dc8ae..e26cfdb 100644
--- a/src/main/java/org/springblade/modules/article/controller/ArticleController.java
+++ b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -219,15 +219,15 @@
}
/**
- * 通知公告表浏览数量加一
+ * 通知公告表浏览数量加一（反诈的居民查看会得积分）
*/
@PostMapping("/addNumber")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "添加浏览数量", notes = "传入notice")
- public R addNumber(@Valid @RequestBody Article notice) {
+ public R addNumber(@Valid @RequestBody ArticleVO notice) {
UpdateWrapper<Article> objectUpdateWrapper = new UpdateWrapper<>();
objectUpdateWrapper.setSql("view_number = view_number + 1");
objectUpdateWrapper.eq("id", notice.getId());
- return R.status(articleService.update(null, objectUpdateWrapper));
+ return R.status(articleService.updateArticle(objectUpdateWrapper,notice.getId(),notice.getHouseCode()));
}
}
diff --git a/src/main/java/org/springblade/modules/article/entity/Article.java b/src/main/java/org/springblade/modules/article/entity/Article.java
index 8d115c3..517532b 100644
--- a/src/main/java/org/springblade/modules/article/entity/Article.java
+++ b/src/main/java/org/springblade/modules/article/entity/Article.java
@@ -28,8 +28,8 @@
@TableField("title")
private String title;
- /** 类型 0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查 */
- @ApiModelProperty(value = "类型 0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查", example = "")
+ /** 类型 0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查 5：反诈宣传 */
+ @ApiModelProperty(value = "类型 0:文章 1经营性收支，2：物业招标 3:公益报名 4：选举调查 5：反诈宣传", example = "")
@TableField("type")
private Integer type;
@@ -136,4 +136,7 @@
@ApiModelProperty(value = "小区id", example = "")
@TableField("district_id")
private String districtId;
+
+ @ApiModelProperty(value = "分数", example = "")
+ private Integer score;
}
diff --git a/src/main/java/org/springblade/modules/article/entity/ArticleIntegralEntity.java b/src/main/java/org/springblade/modules/article/entity/ArticleIntegralEntity.java
index d2fbc19..3ca3277 100644
--- a/src/main/java/org/springblade/modules/article/entity/ArticleIntegralEntity.java
+++ b/src/main/java/org/springblade/modules/article/entity/ArticleIntegralEntity.java
@@ -43,6 +43,12 @@
*/
@ApiModelProperty(value = "得分")
private Integer score;
+
+ /**
+ * 地址编号
+ */
+ @ApiModelProperty(value = "地址编号")
+ private String houseCode;
/**
* 创建人(浏览人用户id)
*/
diff --git a/src/main/java/org/springblade/modules/article/service/ArticleService.java b/src/main/java/org/springblade/modules/article/service/ArticleService.java
index 322f57d..74ee6ea 100644
--- a/src/main/java/org/springblade/modules/article/service/ArticleService.java
+++ b/src/main/java/org/springblade/modules/article/service/ArticleService.java
@@ -1,5 +1,6 @@
package org.springblade.modules.article.service;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.article.entity.Article;
@@ -65,4 +66,13 @@
ArticleVO getArticleOne(ArticleVO article);
List<ArticleVO> getArticleByDistrictId(ArticleVO article);
+
+ /**
+ * 文章信息更新
+ * @param objectUpdateWrapper
+ * @param id
+ * @param houseCode
+ * @return
+ */
+ boolean updateArticle(UpdateWrapper<Article> objectUpdateWrapper,Long id,String houseCode);
}
diff --git a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
index ac90c09..cb8954e 100644
--- a/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
@@ -1,5 +1,6 @@
package org.springblade.modules.article.service.impl;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,8 +10,10 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.article.entity.Article;
+import org.springblade.modules.article.entity.ArticleIntegralEntity;
import org.springblade.modules.article.mapper.ArticleMapper;
import org.springblade.modules.article.service.ArticleService;
+import org.springblade.modules.article.service.IArticleIntegralService;
import org.springblade.modules.article.vo.ArticleVO;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
@@ -184,4 +187,32 @@
article.setDistrictIdList(stringList);
return baseMapper.getArticleByDistrictId(article);
}
+
+ /**
+ * 文章信息更新
+ * @param objectUpdateWrapper
+ * @param id
+ * @param houseCode
+ * @return
+ */
+ @Override
+ public boolean updateArticle(UpdateWrapper<Article> objectUpdateWrapper, Long id, String houseCode) {
+ boolean update = update(null, objectUpdateWrapper);
+ if (update){
+ // 查询对应的文章
+ Article article = getById(id);
+ // 只有反诈的有浏览积分
+ if (article.getType()==6) {
+ // 添加浏览记录信息
+ ArticleIntegralEntity integralEntity = new ArticleIntegralEntity();
+ integralEntity.setScore(article.getScore());
+ integralEntity.setArticleId(id);
+ integralEntity.setHouseCode(houseCode);
+ // 插入记录
+ update = SpringUtils.getBean(IArticleIntegralService.class).save(integralEntity);
+ }
+ }
+ // 返回
+ return update;
+ }
}
--
Gitblit v1.9.3