From 5123f48f469dba99f6929a3f6abbe3690ce3e8c2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Fri, 29 Mar 2024 17:37:13 +0800
Subject: [PATCH] 短信验证码+导出议事报名人员+居住证申请统计bug
---
src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java | 143 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 133 insertions(+), 10 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 bd61884..a432098 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
@@ -16,23 +16,30 @@
*/
package org.springblade.modules.discuss.service.impl;
+import com.alibaba.excel.EasyExcelFactory;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
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.apache.poi.ss.usermodel.HorizontalAlignment;
import org.jetbrains.annotations.Nullable;
import org.springblade.common.constant.CommonConstant;
import org.springblade.common.utils.SpringUtils;
+import org.springblade.core.redis.cache.BladeRedis;
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.excel.householdExcel;
import org.springblade.modules.discuss.mapper.UserTopicsMapper;
import org.springblade.modules.discuss.service.IPublicDiscussService;
import org.springblade.modules.discuss.service.ITopicsService;
@@ -41,12 +48,18 @@
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.HouseEntity;
import org.springblade.modules.house.entity.HouseholdEntity;
+import org.springblade.modules.house.excel.HouseHoldExcel;
+import org.springblade.modules.house.service.IHouseService;
import org.springblade.modules.house.service.IHouseholdService;
+import org.springblade.modules.house.vo.HouseholdVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -61,6 +74,10 @@
public class UserTopicsServiceImpl extends ServiceImpl<UserTopicsMapper, UserTopicsEntity> implements IUserTopicsService {
@Resource
private ITopicsService topicsService;
+ public static final String SMS_VALIDATE_PHONE = "sms:validate:code:";
+
+ @Autowired
+ private BladeRedis redisTemplate;
@Override
public IPage<UserTopicsVO> selectUserTopicsPage(IPage<UserTopicsVO> page, UserTopicsVO userTopics) {
@@ -91,21 +108,33 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public String batchSave(List<TopicsVO> topics) throws Exception {
+ public String batchSave(TopicsVO topics) throws Exception {
+ if (StringUtils.isNotBlank(topics.getPhone())) {
+ Object validateCode = redisTemplate.get(SMS_VALIDATE_PHONE + topics.getPhone());
+ if (validateCode == null) {
+ return "验证码已过期";
+ }
+ if (!validateCode.toString().equals(topics.getCode())) {
+ return "验证码错误";
+ }
+ //删除验证码
+ redisTemplate.del(SMS_VALIDATE_PHONE + topics.getPhone());
+ }
// 判断是否一户一票 还是一人一票
+ List<TopicsVO> topicsList = topics.getChildren();
IHouseholdService householdService = SpringUtils.getBean(IHouseholdService.class);
HouseholdEntity householdEntity = householdService.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
- .eq(HouseholdEntity::getHouseCode, topics.get(0).getHouseCode())
+ .eq(HouseholdEntity::getHouseCode, topicsList.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()));
+ PublicDiscussEntity one = bean.getOne(Wrappers.<PublicDiscussEntity>lambdaQuery().eq(PublicDiscussEntity::getArticleId, topicsList.get(0).getArticleId()));
// 一户一票
if (one.getVoteRestrictions().equals(CommonConstant.NUMBER_ONE)) {
long count = count(Wrappers.<UserTopicsEntity>lambdaQuery()
- .eq(UserTopicsEntity::getHouseCode, topics.get(0).getHouseCode())
- .eq(UserTopicsEntity::getArticleId, topics.get(0).getArticleId()));
+ .eq(UserTopicsEntity::getHouseCode, topicsList.get(0).getHouseCode())
+ .eq(UserTopicsEntity::getArticleId, topicsList.get(0).getArticleId()));
if (count > 0) {
return "您的房屋已投票，不能重复投票！";
}
@@ -113,12 +142,12 @@
//
long count = count(Wrappers.<UserTopicsEntity>lambdaQuery()
.eq(UserTopicsEntity::getHouseholdId, householdEntity.getId())
- .eq(UserTopicsEntity::getArticleId, topics.get(0).getArticleId()));
+ .eq(UserTopicsEntity::getArticleId, topicsList.get(0).getArticleId()));
if (count > 0) {
return "您已投票，不能重复投票！";
}
}
- for (TopicsVO topic : topics) {
+ for (TopicsVO topic : topicsList) {
if (topic.getMandatoryFlag().equals(2)) {
if (topic.getOptionNumberMin() > 1) {
JSONArray objects1 = JSON.parseArray(topic.getSelected());
@@ -134,13 +163,13 @@
}
}
}
- Boolean userTopics = getaBoolean(topics,householdEntity);
+ Boolean userTopics = getaBoolean(topicsList, householdEntity);
if (userTopics) return "200";
return "操作失败！";
}
@Nullable
- private Boolean getaBoolean(List<TopicsVO> topics,HouseholdEntity householdEntity) {
+ private Boolean getaBoolean(List<TopicsVO> topics, HouseholdEntity householdEntity) {
List<UserTopicsEntity> objects = new ArrayList<>();
Boolean result = false;
for (TopicsVO topic : topics) {
@@ -235,4 +264,98 @@
}
return save(userTopics);
}
+
+ @Override
+ public void handleExcel(OutputStream out, UserTopicsVO userTopics) {
+ ExcelWriter excelWriter = EasyExcelFactory.write(out).build();
+ //设置内容样式
+ WriteCellStyle contentStyle = new WriteCellStyle();
+ contentStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);//居中
+ contentStyle.setWrapped(true);//自动换行
+ //设置头部样式
+ WriteCellStyle headerStyle = new WriteCellStyle();
+ headerStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+ //设置策略
+ HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headerStyle, contentStyle);
+ WriteSheet proposalSheet = EasyExcelFactory.writerSheet(0, "委员提案").head(HouseHoldExcel.class).registerWriteHandler(horizontalCellStyleStrategy).build();
+ WriteSheet publicopinionSheet = EasyExcelFactory.writerSheet(1, "社情民意").head(HouseHoldExcel.class).registerWriteHandler(horizontalCellStyleStrategy).build();
+ excelWriter.write(getProposal(userTopics), proposalSheet);
+ excelWriter.write(getPublicopinion(userTopics), publicopinionSheet);
+
+
+ }
+
+ //首页-房屋记录
+ private List<householdExcel> getProposal(UserTopicsVO userTopics) {
+ List<householdExcel> list = new ArrayList<>();
+ JSONArray objects1 = JSON.parseArray(userTopics.getDistrictId());
+ List<String> collect1 = objects1.stream().map(item -> (String)item).collect(Collectors.toList());
+ IDistrictService bean3 = SpringUtils.getBean(IDistrictService.class);
+ List<DistrictEntity> list3 = bean3.list(Wrappers.<DistrictEntity>lambdaQuery().in(DistrictEntity::getId, collect1));
+ List<String> aoiCodeList = list3.stream().map(item -> item.getAoiCode() ).collect(Collectors.toList());
+ userTopics.setAoiCodeList(aoiCodeList);
+ List<householdExcel> householdList = baseMapper.getHouseholdList(userTopics);
+//
+// householdExcel vo = new householdExcel();
+// list.add(vo);
+// IHouseService bean = SpringUtils.getBean(IHouseService.class);
+// JSONArray objects = JSON.parseArray(userTopics.getDistrictId());
+//
+// List<HouseEntity> list1 = bean.list(Wrappers.<HouseEntity>lambdaQuery().in(HouseEntity::getDistrictCode, aoiCodeList));
+//
+// IHouseholdService bean1 = SpringUtils.getBean(IHouseholdService.class);
+//
+// IUserTopicsService bean2 = SpringUtils.getBean(IUserTopicsService.class);
+//
+// for (HouseEntity houseEntity : list1) {
+// householdExcel householdExcel = new householdExcel();
+// householdExcel.setArea(houseEntity.getArea());
+// householdExcel.setBuilding(houseEntity.getBuilding());
+// householdExcel.setRoom(houseEntity.getRoom());
+// householdExcel.setRemark(houseEntity.getRemark());
+// // 查询住户
+// List<HouseholdEntity> list2 = bean1.list(Wrappers.<HouseholdEntity>lambdaQuery()
+// .eq(HouseholdEntity::getHouseCode, houseEntity.getHouseCode())
+// .eq(HouseholdEntity::getIsDeleted, 0)
+// .ne(HouseholdEntity::getRelationship, 18));
+// // 判断住户是否有投票
+// for (HouseholdEntity householdEntity : list2) {
+// householdExcel.setName(householdEntity.getName());
+// householdExcel.setPhone(householdEntity.getPhoneNumber());
+// long count = bean2.count(Wrappers.<UserTopicsEntity>lambdaQuery()
+// .eq(UserTopicsEntity::getHouseholdId, householdEntity.getId()));
+// if (count > 0) {
+// // 查询选择的结果
+// userTopics.setDiscussContent("管理规约");
+// userTopics.setHouseholdId(householdEntity.getId());
+// UserTopicsVO getresult = baseMapper.getresult(userTopics);
+// if (getresult != null) {
+// householdExcel.setManagementRegulations(getresult.getOptionContent());
+// }
+// userTopics.setDiscussContent("议事规则");
+// UserTopicsVO getresult2 = baseMapper.getresult(userTopics);
+// if (getresult2 != null) {
+// householdExcel.setRulesOfProcedure(getresult2.getOptionContent());
+// }
+// householdExcel.setVoteFlag("是");
+// break;
+// } else {
+// householdExcel.setVoteFlag("否");
+// }
+// }
+ // 添加
+ list.addAll(householdList);
+// }
+ return list;
+ }
+
+ //首页-议事
+ private List<UserTopicsExcel> getPublicopinion(UserTopicsVO userTopics) {
+ List<UserTopicsExcel> list = new ArrayList<>();
+ List<UserTopicsExcel> userTopicsExcels = baseMapper.getresultTwo(userTopics);
+ UserTopicsExcel vo = new UserTopicsExcel();
+ list.add(vo);
+ list.addAll(userTopicsExcels);
+ return list;
+ }
}
--
Gitblit v1.9.3