From c4e2c196aad8af656d94bc47e9f1a80bc504b5d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 14 Mar 2024 18:15:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 77 insertions(+), 7 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 4c90d65..369ee7f 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,15 +1,27 @@
package org.springblade.modules.article.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.lettuce.core.dynamic.annotation.Param;
+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.mapper.ArticleMapper;
import org.springblade.modules.article.service.ArticleService;
import org.springblade.modules.article.vo.ArticleVO;
+import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
+import org.springblade.modules.property.entity.PropertyCompanyEntity;
+import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
+import org.springblade.modules.property.service.IPropertyCompanyService;
+import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* @author zhongrj
@@ -22,17 +34,58 @@
/**
* 查询资讯分页信息
+ *
* @param page
* @param article 资讯对象
* @return
*/
@Override
public IPage<Article> selectArticlePage(IPage<Article> page, ArticleVO article) {
+ String userRole = AuthUtil.getUserRole();
+ // 物业身份，只查询该物业公司下的公告
+ // if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
+ // // 物业公司 有哪些小区
+ // 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 (RoleUtil.isProperty(userRole)) {
+ // 查询小区id
+ IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
+ List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
+ // 通过用户机构查询用户的物业公司
+ IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
+ PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
+ if (companyEntity != null) {
+ IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
+ // 通过物业公司，查询小区
+ 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);
+ }
+ }
+ article.setDistrictIdList(districtIds);
+ if (districtIds.size() == 0) {
+ return page.setRecords(new ArrayList<>());
+ }
+ article.setPropertyFlag(1);
+ }
+ if (userRole.contains("jdgly")) {
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ if (regionChildCodesList.size() > 0) {
+ article.setDistrictIdList(regionChildCodesList);
+ }
+ }
return page.setRecords(baseMapper.selectArticlePage(page, article));
}
/**
* 查询资讯分页信息
+ *
* @param page
* @param article 资讯对象
* @return
@@ -42,56 +95,60 @@
// 查询用户小区的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);
}
@Override
public IPage<Article> selectArticleG(IPage<Article> page, ArticleVO article) {
- return page.setRecords(baseMapper.selectArticleG(page,article));
+ return page.setRecords(baseMapper.selectArticleG(page, article));
}
/**
* 查询资讯分页信息(角色权限)
+ *
* @param page
* @param article 资讯对象
* @return
*/
@Override
public IPage<Article> pageDate(IPage<Article> page, ArticleVO article) {
- return page.setRecords(baseMapper.pageDate(page,article));
+ return page.setRecords(baseMapper.pageDate(page, article));
}
/**
* 查询资讯分页信息(敏感词预警)
+ *
* @param page
* @param article 资讯对象
* @return
*/
@Override
public IPage<Article> pageWords(IPage<Article> page, ArticleVO article) {
- return page.setRecords(baseMapper.pageWords(page,article));
+ return page.setRecords(baseMapper.pageWords(page, article));
}
@Override
public IPage<Article> pageCollectList(IPage<Article> page, ArticleVO article) {
- return page.setRecords(baseMapper.pageCollectList(page,article));
+ return page.setRecords(baseMapper.pageCollectList(page, article));
}
/**
* 查询资讯分页信息(角色权限)附带评论点赞数
+ *
* @param page
* @param article 资讯对象
* @return
*/
@Override
public IPage<Article> pageLikes(IPage<Article> page, ArticleVO article) {
- return page.setRecords(baseMapper.pageLikes(page,article));
+ return page.setRecords(baseMapper.pageLikes(page, article));
}
@Override
public IPage<Article> pageCollect(IPage<Article> page, ArticleVO article) {
- return page.setRecords(baseMapper.pageCollect(page,article));
+ return page.setRecords(baseMapper.pageCollect(page, article));
}
/**
@@ -106,7 +163,20 @@
@Override
public ArticleVO getArticleOne(ArticleVO article) {
+ if (article.getType() != null && article.getType().equals(4)) {
+ article.setParentId("1740566650527752194");
+ } else {
+ article.setParentId("1722966265111248897");
+ }
ArticleVO articleVO = baseMapper.getArticleOne(article);
return articleVO;
}
+
+ @Override
+ public List<ArticleVO> getArticleByDistrictId(ArticleVO article) {
+ List<String> objects = new ArrayList<>();
+ objects.add(article.getDistrictId());
+ article.setDistrictIdList(objects);
+ return baseMapper.getArticleByDistrictId(article);
+ }
}
--
Gitblit v1.9.3