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/service/impl/ArticleServiceImpl.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 9 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 3a72e67..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,16 +1,22 @@
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.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.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
@@ -19,6 +25,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -50,20 +57,21 @@
// List<String> collect = list.stream().map(PropertyCompanyDistrictEntity::getDistrictId).collect(Collectors.toList());
// article.setDistrictIdList(collect);
// }
- if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
+ if (RoleUtil.isProperty(userRole)) {
// 查询小区id
IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
// 通过用户机构查询用户的物业公司
IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
- PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
- if (one != null) {
+ PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery()
+ .eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()).last("limit 1"));
+ if (companyEntity != null) {
IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
// 通过物业公司，查询小区
- List<PropertyCompanyDistrictEntity> list = bean2.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
- .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, one.getId()));
- if (list.size() > 0) {
- List<String> collect = list.stream().map(i -> i.getDistrictId()).collect(Collectors.toList());
+ List<PropertyCompanyDistrictEntity> propertyCompanyDistrictEntityList = bean2.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
+ .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, companyEntity.getId()));
+ if (propertyCompanyDistrictEntityList.size() > 0) {
+ List<String> collect = propertyCompanyDistrictEntityList.stream().map(i -> i.getDistrictId()).collect(Collectors.toList());
districtIds.addAll(collect);
}
}
@@ -71,11 +79,14 @@
if (districtIds.size() == 0) {
return page.setRecords(new ArrayList<>());
}
+ article.setPropertyFlag(1);
}
if (userRole.contains("jdgly")) {
+ IDistrictService districtService = SpringUtils.getBean(IDistrictService.class);
List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
- if (regionChildCodesList.size() > 0) {
- article.setDistrictIdList(regionChildCodesList);
+ List<DistrictEntity> list = districtService.list(Wrappers.<DistrictEntity>lambdaQuery().in(DistrictEntity::getCommunityCode, regionChildCodesList));
+ if (list.size() > 0) {
+ article.setDistrictIdList(list.stream().map(item -> item.getId()).collect(Collectors.toList()));
}
}
return page.setRecords(baseMapper.selectArticlePage(page, article));
@@ -93,6 +104,7 @@
// 查询用户小区的id
String districId = baseMapper.getDistrictId(article.getHouseCode());
article.setDistrictId(districId);
+ article.setUserId(AuthUtil.getUserId());
List<ArticleVO> articleVOS = baseMapper.selectArticlePageByApp(page, article);
return page.setRecords(articleVOS);
}
@@ -168,4 +180,39 @@
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);
+ // 插入记录
+ update = SpringUtils.getBean(IArticleIntegralService.class).save(integralEntity);
+ }
+ }
+ // 返回
+ return update;
+ }
}
--
Gitblit v1.9.3