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/discuss/service/impl/UserTopicsServiceImpl.java | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 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 202c1a7..fcf8e67 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
@@ -25,23 +25,28 @@
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.Nullable;
import org.springblade.common.constant.CommonConstant;
+import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
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;
import org.springblade.modules.discuss.service.IUserTopicsService;
import org.springblade.modules.discuss.vo.TopicsVO;
import org.springblade.modules.discuss.vo.UserTopicsVO;
+import org.springblade.modules.district.entity.DistrictEntity;
+import org.springblade.modules.district.service.IDistrictService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 用户议题报表 服务实现类
@@ -56,37 +61,53 @@
@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);
+ 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));
}
@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
private Boolean getaBoolean(List<TopicsVO> topics) {
List<UserTopicsEntity> objects = new ArrayList<>();
+ Boolean result = false;
for (TopicsVO topic : topics) {
UserTopicsEntity userTopicsEntity = new UserTopicsEntity();
userTopicsEntity.setUserId(AuthUtil.getUserId());
@@ -103,6 +124,7 @@
userTopics.setSelected(topic.getSelected());
userTopics.setUserId(AuthUtil.getUserId());
userTopics.setPublicDiscussId(topic.getPublicDiscussId());
+ userTopics.setTopicsId(Integer.valueOf(topic.getSelected()));
userTopics.setArticleId(topic.getArticleId());
userTopics.setHouseCode(topic.getHouseCode());
userTopics.setSignaturePath(topic.getSignaturePath());
@@ -110,7 +132,7 @@
objectUpdateWrapper.setSql("number = number + 1");
objectUpdateWrapper.eq("id", topic.getSelected());
topicsService.update(null, objectUpdateWrapper);
- return save(userTopics);
+ result = save(userTopics);
} else {
// 多选
if (StringUtils.isBlank(topic.getSelected())) {
@@ -125,6 +147,7 @@
userTopics.setPublicDiscussId(topic.getPublicDiscussId());
userTopics.setArticleId(topic.getArticleId());
userTopics.setHouseCode(topic.getHouseCode());
+ userTopics.setTopicsId((Integer) o);
userTopics.setSignaturePath(topic.getSignaturePath());
objectsTwo.add(userTopics);
UpdateWrapper<TopicsEntity> objectUpdateWrapper = new UpdateWrapper<>();
@@ -132,10 +155,10 @@
objectUpdateWrapper.eq("id", o);
topicsService.update(null, objectUpdateWrapper);
}
- return save(objectsTwo.get(0));
+ result = saveBatch(objectsTwo);
}
}
- return null;
+ return result;
}
@@ -146,4 +169,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