From 922f1696e39be0a472461793daafadd6c6dbfad1 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 11 Nov 2023 16:02:58 +0800
Subject: [PATCH] 标签报事+通知公告
---
src/main/java/org/springblade/modules/article/entity/Article.java | 2 +-
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 20 ++++++++++++--------
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 8 ++++----
src/main/java/org/springblade/modules/article/controller/ArticleController.java | 5 +++++
4 files changed, 22 insertions(+), 13 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 6cbb4ef..117fa69 100644
--- a/src/main/java/org/springblade/modules/article/controller/ArticleController.java
+++ b/src/main/java/org/springblade/modules/article/controller/ArticleController.java
@@ -15,6 +15,7 @@
import org.springblade.modules.article.service.ArticleService;
import org.springblade.modules.article.vo.ArticleVO;
import org.springframework.web.bind.annotation.*;
+
import javax.validation.Valid;
import java.util.Date;
@@ -109,6 +110,10 @@
@ApiOperation(value = "详情", notes = "传入articleoy")
public R<Article> detail(Article article) {
Article detail = articleService.getOne(Condition.getQueryWrapper(article));
+ UpdateWrapper<Article> objectUpdateWrapper = new UpdateWrapper<>();
+ objectUpdateWrapper.setSql("view_number = view_number + 1");
+ objectUpdateWrapper.eq("id", article.getId());
+ articleService.update(null, objectUpdateWrapper);
return R.data(detail);
}
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 09f2b8d..2a8fa86 100644
--- a/src/main/java/org/springblade/modules/article/entity/Article.java
+++ b/src/main/java/org/springblade/modules/article/entity/Article.java
@@ -105,7 +105,7 @@
* 创建时间
*/
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
index 596042f..d5c0a7e 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -62,16 +62,20 @@
article_type,
recommend,
publish,
- iscomment,
- view_number,
- create_time,
- update_time,
- update_user,
- create_user,
- is_deleted
+ iscomment,
+ view_number,
+ create_time,
+ update_time,
+ update_user,
+ create_user,
+ is_deleted
from jczz_article
where is_deleted = 0
- and publish = 1
+ and publish = 1
+ <if test="article.articleType != null">
+ and article_type = #{article.articleType}
+ </if>
+ order by create_time desc
</select>
<!--查询资讯分页列表信息-->
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index 33cb754..51106ae 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -112,8 +112,8 @@
List<TreeNode> houseNodeList = householdService.selectHouseNodeList(AuthUtil.getUserId());
for (TreeNode treeNode : houseNodeList) {
// 判断房屋类型类型
- if (treeNode.getDoorplateType().equals(DictConstant.SMALL_DOORPLATE) ||
- (treeNode.getDoorplateType().equals(DictConstant.centre_DOORPLATE) &&
+ if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
+ (DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
treeNode.getAddressLevel().equals(1))) {
treeNode.setAddressType(2);
} else {
@@ -123,8 +123,8 @@
// 查询场所集合信息
List<TreeNode> placeNodeList = placeService.selectPlaceNodeList(AuthUtil.getUserId());
for (TreeNode treeNode : placeNodeList) {
- if (treeNode.getDoorplateType().equals(DictConstant.SMALL_DOORPLATE) ||
- (treeNode.getDoorplateType().equals(DictConstant.centre_DOORPLATE) &&
+ if (DictConstant.SMALL_DOORPLATE.equals(treeNode.getDoorplateType()) ||
+ (DictConstant.centre_DOORPLATE.equals(treeNode.getDoorplateType()) &&
treeNode.getAddressLevel().equals(1))) {
treeNode.setAddressType(2);
} else {
--
Gitblit v1.9.3