From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 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 0d55d2f..2181a41 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
@@ -31,6 +31,7 @@
import org.springblade.modules.discuss.entity.PublicDiscussEntity;
import org.springblade.modules.discuss.entity.TopicsEntity;
import org.springblade.modules.discuss.entity.UserTopicsEntity;
+import org.springblade.modules.discuss.excel.UserTopicsExcel;
import org.springblade.modules.discuss.mapper.UserTopicsMapper;
import org.springblade.modules.discuss.service.IPublicDiscussService;
import org.springblade.modules.discuss.service.ITopicsService;
@@ -45,6 +46,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 用户议题报表 服务实现类
@@ -60,10 +62,14 @@
@Override
public IPage<UserTopicsVO> selectUserTopicsPage(IPage<UserTopicsVO> page, UserTopicsVO userTopics) {
if (StringUtils.isNotBlank(userTopics.getDistrictId())) {
+ List<String> longs = JSON.parseArray(userTopics.getDistrictId()).toJavaList(String.class);
IDistrictService bean = SpringUtils.getBean(IDistrictService.class);
- DistrictEntity one = bean.getOne(Wrappers.<DistrictEntity>lambdaQuery().eq(DistrictEntity::getId, userTopics.getDistrictId()));
- if (one != null) {
- userTopics.setAoiCode(one.getAoiCode());
+ List<DistrictEntity> list = bean.list(Wrappers.<DistrictEntity>lambdaQuery().in(DistrictEntity::getId, longs));
+ List<String> collect = list.stream().map(item ->
+ item.getAoiCode()
+ ).collect(Collectors.toList());
+ if (collect != null) {
+ userTopics.setAoiCodeList(collect);
}
}
return page.setRecords(baseMapper.selectUserTopicsPage(page, userTopics));
@@ -72,26 +78,30 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean batchSave(List<TopicsVO> topics) throws Exception {
+ public String batchSave(List<TopicsVO> topics) throws Exception {
// 判断是否一户一票 还是一人一票
IPublicDiscussService bean = SpringUtil.getBean(IPublicDiscussService.class);
PublicDiscussEntity one = bean.getOne(Wrappers.<PublicDiscussEntity>lambdaQuery().eq(PublicDiscussEntity::getArticleId, topics.get(0).getArticleId()));
// 一户一票
if (one.getVoteRestrictions().equals(CommonConstant.NUMBER_ONE)) {
- long count = count(Wrappers.<UserTopicsEntity>lambdaQuery().eq(UserTopicsEntity::getHouseCode, topics.get(0).getHouseCode()));
- if (count > 1) {
- throw new Exception("您的房屋已投票，不能重复投票！");
+ long count = count(Wrappers.<UserTopicsEntity>lambdaQuery()
+ .eq(UserTopicsEntity::getHouseCode, topics.get(0).getHouseCode())
+ .eq(UserTopicsEntity::getArticleId, topics.get(0).getArticleId()));
+ if (count > 0) {
+ return "您的房屋已投票，不能重复投票！";
}
} else {
//
- long count = count(Wrappers.<UserTopicsEntity>lambdaQuery().eq(UserTopicsEntity::getUserId, AuthUtil.getUserId()));
- if (count > 1) {
- throw new Exception("您的已投票，不能重复投票！");
+ long count = count(Wrappers.<UserTopicsEntity>lambdaQuery()
+ .eq(UserTopicsEntity::getUserId, AuthUtil.getUserId())
+ .eq(UserTopicsEntity::getArticleId, topics.get(0).getArticleId()));
+ if (count > 0) {
+ return "您的已投票，不能重复投票！";
}
}
Boolean userTopics = getaBoolean(topics);
- if (userTopics != null) return userTopics;
- return false;
+ if (userTopics) return "200";
+ return "操作失败！";
}
@Nullable
@@ -147,7 +157,7 @@
return saveBatch(objectsTwo);
}
}
- return null;
+ return false;
}
@@ -158,4 +168,21 @@
.groupBy(UserTopicsEntity::getUserId));
return list.size();
}
+
+ @Override
+ public List<UserTopicsExcel> exportUser(UserTopicsVO userTopics) {
+ if (StringUtils.isNotBlank(userTopics.getDistrictId())) {
+ List<String> longs = JSON.parseArray(userTopics.getDistrictId()).toJavaList(String.class);
+ IDistrictService bean = SpringUtils.getBean(IDistrictService.class);
+ List<DistrictEntity> list = bean.list(Wrappers.<DistrictEntity>lambdaQuery().in(DistrictEntity::getId, longs));
+ List<String> collect = list.stream().map(item ->
+ item.getAoiCode()
+ ).collect(Collectors.toList());
+ if (collect != null) {
+ userTopics.setAoiCodeList(collect);
+ }
+ }
+ List<UserTopicsExcel> userTopicsExcels = baseMapper.exportUser(userTopics);
+ return userTopicsExcels;
+ }
}
--
Gitblit v1.9.3