From a5fac95408a43ad43de9d88c30d06c0918c7bc8f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 29 May 2024 11:14:44 +0800
Subject: [PATCH] 配置调整

---
 src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java |   88 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 65 insertions(+), 23 deletions(-)

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 f1127ca..9583a5c 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,21 +1,25 @@
 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;
 import org.springblade.common.cache.SysCache;
+import org.springblade.common.utils.AuthUtils;
+import org.springblade.common.utils.RoleUtil;
 import org.springblade.common.utils.SpringUtils;
 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;
-import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
-import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -38,22 +42,6 @@
 	@Override
 	public IPage<Article> selectArticlePage(IPage<Article> page, ArticleVO article) {
 		String userRole = AuthUtil.getUserRole();
-		// 物业身份，只查询该物业公司下的公告
-		if (userRole.contains("wygly")) {
-			IPropertyCompanyDistrictService bean = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
-			List<PropertyCompanyDistrictEntity> list = bean.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
-				.eq(PropertyCompanyDistrictEntity::getUserId, AuthUtil.getUserId()));
-			List<String> collect = list.stream().map(PropertyCompanyDistrictEntity::getDistrictId).collect(Collectors.toList());
-			article.setDistrictIdList(collect);
-		}
-		if (userRole.contains("jdgly")) {
-			List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
-			IDistrictService bean = SpringUtils.getBean(IDistrictService.class);
-			List<DistrictEntity> list = bean.list(Wrappers.<DistrictEntity>lambdaQuery()
-				.in(DistrictEntity::getCommunityCode, regionChildCodesList));
-			List<String> fieldValues = list.stream().map(DistrictEntity::getId).collect(Collectors.toList());
-			article.setDistrictIdList(fieldValues);
-		}
 		return page.setRecords(baseMapper.selectArticlePage(page, article));
 	}
 
@@ -66,9 +54,6 @@
 	 */
 	@Override
 	public IPage<ArticleVO> selectArticlePageByApp(IPage<ArticleVO> page, ArticleVO article) {
-		// 查询用户小区的id
-		String districId = baseMapper.getDistrictId(article.getHouseCode());
-		article.setDistrictId(districId);
 		List<ArticleVO> articleVOS = baseMapper.selectArticlePageByApp(page, article);
 		return page.setRecords(articleVOS);
 	}
@@ -144,4 +129,61 @@
 		ArticleVO articleVO = baseMapper.getArticleOne(article);
 		return articleVO;
 	}
+
+	@Override
+	public List<ArticleVO> getArticleByDistrictId(ArticleVO article) {
+		List<String> stringList = Arrays.asList(article.getDistrictId().split(","));
+		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);
+				integralEntity.setCreateUser(AuthUtil.getUserId());
+				// 插入记录
+				update = SpringUtils.getBean(IArticleIntegralService.class).save(integralEntity);
+			}
+		}
+		// 返回
+		return update;
+	}
+
+	/**
+	 * 查询所有文章数据
+	 *
+	 * @return
+	 */
+	@Override
+	public List<Article> getAllList(int i, int size) {
+		return baseMapper.getAllList(i, size);
+	}
+
+	/**
+	 * 查询所有文章数据总数
+	 *
+	 * @return
+	 */
+	@Override
+	public int getAllListTotal() {
+		return baseMapper.getAllListTotal();
+	}
 }

--
Gitblit v1.9.3