From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 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 e8f5f7c..8f6aef1 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
@@ -5,6 +5,7 @@
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;
@@ -83,9 +84,9 @@
}
article.setPropertyFlag(1);
}
- if (userRole.contains("jdgly")) {
+ if (userRole.contains("jdgly") || userRole.contains("sqgly")) {
IDistrictService districtService = SpringUtils.getBean(IDistrictService.class);
- List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId(),null);
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId(), null);
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()));
@@ -103,15 +104,27 @@
*/
@Override
public IPage<ArticleVO> selectArticlePageByApp(IPage<ArticleVO> page, ArticleVO article) {
- // 查询用户小区的id
- String districId = baseMapper.getDistrictId(article.getHouseCode());
- article.setDistrictId(districId);
-
+ // 判断是否管理员
+ if (AuthUtils.isAdministratorOrAdmin(SpringUtils.getRequestParam("roleName"))) {
+ IDistrictService districtService = SpringUtils.getBean(IDistrictService.class);
+ String communityCode = SpringUtils.getRequestParam("communityCode");
+ List<DistrictEntity> list = districtService.list(Wrappers.<DistrictEntity>lambdaQuery()
+ .like(DistrictEntity::getCommunityCode, communityCode));
+ if (list.size() > 0) {
+ article.setDistrictIdList(list.stream().map(item -> item.getId()).collect(Collectors.toList()));
+ }
+ } else {
+ // 查询用户小区的id
+ String districId = baseMapper.getDistrictId(article.getHouseCode());
+ List<String> objects = new ArrayList<>();
+ objects.add(districId);
+ article.setDistrictIdList(objects);
+ }
IHouseholdService householdService = SpringUtils.getBean(IHouseholdService.class);
HouseholdEntity householdEntity = householdService.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
.eq(HouseholdEntity::getHouseCode, article.getHouseCode())
- .eq(HouseholdEntity::getAssociatedUserId,AuthUtil.getUserId())
- .eq(HouseholdEntity::getIsDeleted,0)
+ .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
+ .eq(HouseholdEntity::getIsDeleted, 0)
.last("limit 1"));
if (householdEntity != null) {
article.setHouseholdId(householdEntity.getId());
@@ -201,6 +214,7 @@
/**
* 文章信息更新
+ *
* @param objectUpdateWrapper
* @param id
* @param houseCode
@@ -209,16 +223,17 @@
@Override
public boolean updateArticle(UpdateWrapper<Article> objectUpdateWrapper, Long id, String houseCode) {
boolean update = update(null, objectUpdateWrapper);
- if (update){
+ if (update) {
// 查询对应的文章
Article article = getById(id);
// 只有反诈的有浏览积分
- if (article.getType()==6) {
+ 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);
}
@@ -226,4 +241,24 @@
// 返回
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