From 6db2b7de0799ca56c24af7e917c622e2fc951f72 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 02 Apr 2024 14:39:45 +0800
Subject: [PATCH] 保存短信发送记录
---
src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java | 190 ++++++++++++++++++++++++++++-------------------
1 files changed, 113 insertions(+), 77 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 703f75f..00f30ee 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
@@ -106,17 +106,20 @@
@Override
@Transactional(rollbackFor = Exception.class)
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());
-// }
+ if (StringUtils.isNotBlank(topics.getPhone())) {
+ if (StringUtils.isBlank(topics.getCode())) {
+ return "验证码不能为空！";
+ }
+ 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);
@@ -262,104 +265,137 @@
return save(userTopics);
}
+ /**
+ * 处理Excel文件的生成，将用户主题数据写入Excel并输出到流中。
+ *
+ * @param out 输出流，用于保存生成的Excel文件。
+ * @param userTopics 用户主题数据，包含提案和投票记录信息。
+ */
@Override
public void handleExcel(OutputStream out, UserTopicsVO userTopics) {
- // 设置excel工作簿
+ // 初始化Excel写入器
ExcelWriter excelWriter = EasyExcel.write(out)
.build();
-// List<householdExcel> userList = new ArrayList<>();
-// for (int i = 0; i < 10; i++) {
-// HouseHoldExcel houseHoldExcel = new HouseHoldExcel();
-// houseHoldExcel.setHouseCode(i+"1");
-// }
- //设置自动换行
-
+ // 设置内容自动换行的样式
WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
contentWriteCellStyle.setWrapped(true);
+ // 处理并写入提案数据
List<holdExcel> proposal = getProposal(userTopics);
ExcelWriterSheetBuilder userExcelSheet = new ExcelWriterSheetBuilder();
- userExcelSheet.registerWriteHandler(new HorizontalCellStyleStrategy(null,contentWriteCellStyle));
+ userExcelSheet.registerWriteHandler(new HorizontalCellStyleStrategy(null, contentWriteCellStyle));
userExcelSheet.sheetName("小区投票人员");
userExcelSheet.sheetNo(0);
userExcelSheet.head(holdExcel.class);
excelWriter.write(proposal, userExcelSheet.build());
-
-// List<householdExcel> classInfoList = new ArrayList<>();
-// for (int i = 0; i < 10; i++) {
-// HouseHoldExcel houseHoldExcel = new HouseHoldExcel();
-// houseHoldExcel.setHouseCode(i+"1");
-// }
+ // 处理并写入投票记录数据
List<UserTopicsExcel> publicopinion = getPublicopinion(userTopics);
ExcelWriterSheetBuilder classExcelSheet = new ExcelWriterSheetBuilder();
- classExcelSheet.registerWriteHandler(new HorizontalCellStyleStrategy(null,contentWriteCellStyle));
+ classExcelSheet.registerWriteHandler(new HorizontalCellStyleStrategy(null, contentWriteCellStyle));
classExcelSheet.sheetName("投票记录");
classExcelSheet.sheetNo(1);
classExcelSheet.head(UserTopicsExcel.class);
excelWriter.write(publicopinion, classExcelSheet.build());
-
+ // 完成Excel写入并释放资源
excelWriter.finish();
-// 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);
-
-
}
- //首页-房屋记录
+ /**
+ * 获取首页的房屋记录
+ *
+ * @param userTopics 包含用户话题信息的对象，其中可能含有区域ID等关键信息
+ * @return 返回一个包含房屋记录信息的列表
+ */
private List<holdExcel> getProposal(UserTopicsVO userTopics) {
- List<holdExcel> 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<holdExcel> householdList = baseMapper.getHouseholdList(userTopics);
- householdList.stream().forEach(item -> {
- if (StringUtils.isBlank(item.getOptionContent())) {
- item.setVoteFlag("否");
- } else {
- ITopicsService bean = SpringUtils.getBean(ITopicsService.class);
-
- List<Long> longs = Func.toLongList(item.getOptionContent());
- for (Long aLong : longs) {
- TopicsEntity topics = bean.getById(aLong);
- if (StringUtils.isNotBlank(topics.getDiscussContent()) && topics.getDiscussContent().equals("管理规约")) {
- item.setManagementRegulations(topics.getOptionContent());
- }
- if (StringUtils.isNotBlank(topics.getDiscussContent()) && topics.getDiscussContent().equals("议事规则")) {
- item.setRulesOfProcedure(topics.getOptionContent());
- }
- }
-
- item.setVoteFlag("是");
- }
- });
- // 添加
- list.addAll(householdList);
- return list;
+ List<holdExcel> resultList = new ArrayList<>();
+ try {
+ // 检查区域ID字符串是否有效
+ JSONArray objects1 = validateAndParseDistrictId(userTopics.getDistrictId());
+ // 获取区域服务和话题服务的实例
+ IDistrictService districtService = SpringUtils.getBean(IDistrictService.class);
+ ITopicsService topicsService = SpringUtils.getBean(ITopicsService.class);
+ // 处理区域ID并查询对应的区域实体列表
+ List<String> aoiCodeList = processDistrictIds(districtService, objects1);
+ // 设置AOI代码列表到用户话题对象中
+ userTopics.setAoiCodeList(aoiCodeList);
+ // 查询并处理房屋列表信息
+ List<holdExcel> householdList = processHouseholdList(topicsService, userTopics);
+ resultList.addAll(householdList);
+ } catch (Exception e) {
+ // 适当的异常处理逻辑
+ // 例如：记录日志、返回错误信息等
+ e.printStackTrace();
+ }
+ return resultList;
}
- //首页-议事
+ /**
+ * 验证并解析区域ID字符串。
+ *
+ * @param districtIdStr 区域ID的字符串表示。不能为空或空白字符串。
+ * @return 返回一个JSONArray对象，包含解析后的区域ID。
+ * @throws IllegalArgumentException 如果区域ID字符串为空或空白字符串，抛出此异常。
+ */
+ private JSONArray validateAndParseDistrictId(String districtIdStr) throws IllegalArgumentException {
+ // 验证区域ID字符串是否为空
+ if (StringUtils.isBlank(districtIdStr)) {
+ throw new IllegalArgumentException("区域ID不能为空");
+ }
+ // 解析区域ID字符串为JSONArray对象
+ return JSON.parseArray(districtIdStr);
+ }
+
+ private List<String> processDistrictIds(IDistrictService districtService, JSONArray districtIds) {
+ List<String> collect1 = districtIds.stream().map(item -> (String) item).collect(Collectors.toList());
+ List<DistrictEntity> list3 = districtService.list(Wrappers.<DistrictEntity>lambdaQuery().in(DistrictEntity::getId, collect1));
+ return list3.stream().map(item -> item.getAoiCode()).collect(Collectors.toList());
+ }
+
+ private List<holdExcel> processHouseholdList(ITopicsService topicsService, UserTopicsVO userTopics) {
+ List<holdExcel> householdList = baseMapper.getHouseholdList(userTopics);
+ householdList.forEach(item -> processItem(topicsService, item));
+ return householdList;
+ }
+
+ private void processItem(ITopicsService topicsService, holdExcel item) {
+ if (StringUtils.isBlank(item.getOptionContent())) {
+ item.setVoteFlag("否");
+ } else {
+ List<Long> longs = Func.toLongList(item.getOptionContent());
+ for (Long aLong : longs) {
+ TopicsEntity topics = topicsService.getById(aLong);
+ setManagementRegulationsOrRulesOfProcedure(item, topics);
+ }
+ item.setVoteFlag("是");
+ }
+ }
+
+ private void setManagementRegulationsOrRulesOfProcedure(holdExcel item, TopicsEntity topics) {
+ if (StringUtils.isNotBlank(topics.getDiscussContent())) {
+ if (topics.getDiscussContent().equals("管理规约")) {
+ item.setManagementRegulations(topics.getOptionContent());
+ } else if (topics.getDiscussContent().equals("议事规则")) {
+ item.setRulesOfProcedure(topics.getOptionContent());
+ }
+ }
+ }
+
+
+ /**
+ * 获取公开意见信息
+ *
+ * @param userTopics 用户话题VO对象，封装了用户话题的查询条件
+ * @return 返回用户话题的Excel格式列表，包含所有符合条件的意见信息
+ */
private List<UserTopicsExcel> getPublicopinion(UserTopicsVO userTopics) {
+ // 初始化返回列表
List<UserTopicsExcel> list = new ArrayList<>();
+ // 通过基础mapper查询结果，并将结果添加到列表中
List<UserTopicsExcel> userTopicsExcels = baseMapper.getresultTwo(userTopics);
list.addAll(userTopicsExcels);
return list;
--
Gitblit v1.9.3