From 40a647b468d117381abf63d9f98f1cc9308ef3fc Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 27 Mar 2024 10:23:47 +0800
Subject: [PATCH] 议事查询优化
---
src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
index fcf8e67..aca543d 100644
--- a/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java
@@ -22,6 +22,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import liquibase.pro.packaged.H;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.Nullable;
import org.springblade.common.constant.CommonConstant;
@@ -40,6 +41,8 @@
import org.springblade.modules.discuss.vo.UserTopicsVO;
import org.springblade.modules.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
+import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.service.IHouseholdService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -72,7 +75,17 @@
userTopics.setAoiCodeList(collect);
}
}
- return page.setRecords(baseMapper.selectUserTopicsPage(page, userTopics));
+ IHouseholdService householdService = SpringUtils.getBean(IHouseholdService.class);
+ HouseholdEntity householdEntity = householdService.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
+ .eq(HouseholdEntity::getHouseCode, userTopics.getHouseCode())
+ .eq(HouseholdEntity::getAssociatedUserId,AuthUtil.getUserId())
+ .eq(HouseholdEntity::getIsDeleted,0)
+ .last("limit 1"));
+ if (householdEntity != null) {
+ userTopics.setHouseholdId(householdEntity.getId());
+ }
+ List<UserTopicsVO> userTopicsVOS = baseMapper.selectUserTopicsPage(page, userTopics);
+ return page.setRecords(userTopicsVOS);
}
@@ -80,6 +93,12 @@
@Transactional(rollbackFor = Exception.class)
public String batchSave(List<TopicsVO> topics) throws Exception {
// 判断是否一户一票 还是一人一票
+ IHouseholdService householdService = SpringUtils.getBean(IHouseholdService.class);
+ HouseholdEntity householdEntity = householdService.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
+ .eq(HouseholdEntity::getHouseCode, topics.get(0).getHouseCode())
+ .eq(HouseholdEntity::getAssociatedUserId,AuthUtil.getUserId())
+ .eq(HouseholdEntity::getIsDeleted,0)
+ .last("limit 1"));
IPublicDiscussService bean = SpringUtil.getBean(IPublicDiscussService.class);
PublicDiscussEntity one = bean.getOne(Wrappers.<PublicDiscussEntity>lambdaQuery().eq(PublicDiscussEntity::getArticleId, topics.get(0).getArticleId()));
// 一户一票
@@ -93,24 +112,24 @@
} else {
//
long count = count(Wrappers.<UserTopicsEntity>lambdaQuery()
- .eq(UserTopicsEntity::getUserId, AuthUtil.getUserId())
+ .eq(UserTopicsEntity::getHouseholdId, householdEntity.getId())
.eq(UserTopicsEntity::getArticleId, topics.get(0).getArticleId()));
if (count > 0) {
return "您已投票，不能重复投票！";
}
}
- Boolean userTopics = getaBoolean(topics);
+ Boolean userTopics = getaBoolean(topics,householdEntity);
if (userTopics) return "200";
return "操作失败！";
}
@Nullable
- private Boolean getaBoolean(List<TopicsVO> topics) {
+ private Boolean getaBoolean(List<TopicsVO> topics,HouseholdEntity householdEntity) {
List<UserTopicsEntity> objects = new ArrayList<>();
Boolean result = false;
for (TopicsVO topic : topics) {
UserTopicsEntity userTopicsEntity = new UserTopicsEntity();
- userTopicsEntity.setUserId(AuthUtil.getUserId());
+ userTopicsEntity.setHouseholdId(householdEntity.getId());
userTopicsEntity.setSelected(topic.getSelected());
userTopicsEntity.setTopicsId(topic.getId());
userTopicsEntity.setPublicDiscussId(topic.getPublicDiscussId());
@@ -122,7 +141,7 @@
}
UserTopicsEntity userTopics = new UserTopicsEntity();
userTopics.setSelected(topic.getSelected());
- userTopics.setUserId(AuthUtil.getUserId());
+ userTopics.setHouseholdId(householdEntity.getId());
userTopics.setPublicDiscussId(topic.getPublicDiscussId());
userTopics.setTopicsId(Integer.valueOf(topic.getSelected()));
userTopics.setArticleId(topic.getArticleId());
@@ -143,7 +162,7 @@
for (Object o : objects1) {
UserTopicsEntity userTopics = new UserTopicsEntity();
userTopics.setSelected(topic.getSelected());
- userTopics.setUserId(AuthUtil.getUserId());
+ userTopics.setHouseholdId(householdEntity.getId());
userTopics.setPublicDiscussId(topic.getPublicDiscussId());
userTopics.setArticleId(topic.getArticleId());
userTopics.setHouseCode(topic.getHouseCode());
@@ -166,7 +185,7 @@
public Integer getCount(Integer id) {
List<UserTopicsEntity> list = list(Wrappers.<UserTopicsEntity>lambdaQuery()
.eq(UserTopicsEntity::getPublicDiscussId, id)
- .groupBy(UserTopicsEntity::getUserId));
+ .groupBy(UserTopicsEntity::getHouseholdId));
return list.size();
}
@@ -186,4 +205,18 @@
List<UserTopicsExcel> userTopicsExcels = baseMapper.exportUser(userTopics);
return userTopicsExcels;
}
+
+ @Override
+ public Boolean saveUserTopicsEntity(UserTopicsEntity userTopics) {
+ IHouseholdService householdService = SpringUtils.getBean(IHouseholdService.class);
+ HouseholdEntity householdEntity = householdService.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
+ .eq(HouseholdEntity::getHouseCode, userTopics.getHouseCode())
+ .eq(HouseholdEntity::getAssociatedUserId,AuthUtil.getUserId())
+ .eq(HouseholdEntity::getIsDeleted,0)
+ .last("limit 1"));
+ if (householdEntity != null) {
+ userTopics.setHouseholdId(householdEntity.getId());
+ }
+ return save(userTopics);
+ }
}
--
Gitblit v1.9.3