议事问题优化

lin

2024-04-20 aabce4b306d3fb996a64ad41d40bc5629512d2fa

 src/main/java/org/springblade/modules/discuss/service/impl/UserTopicsServiceImpl.java

@@ -27,12 +27,14 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.time.DateFormatUtils;
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.redis.cache.BladeRedis;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.discuss.entity.PublicDiscussEntity;
@@ -107,6 +109,16 @@
   @Override
   @Transactional(rollbackFor = Exception.class)
   public String batchSave(TopicsVO topics) throws Exception {
      List<TopicsVO> topicsList = topics.getChildren();
      if (topicsList == null || topicsList.isEmpty()) {
         return "你未选选项内容";
      }
      IPublicDiscussService bean = SpringUtil.getBean(IPublicDiscussService.class);
      PublicDiscussEntity discussEntity = bean.getOne(Wrappers.<PublicDiscussEntity>lambdaQuery().eq(PublicDiscussEntity::getArticleId, topicsList.get(0).getArticleId()));
      // 判断是否在开始和结束时间内
      if (discussEntity.getStartTime().getTime() > System.currentTimeMillis() || discussEntity.getEndTime().getTime() < System.currentTimeMillis()) {
         return "目前不在投票时间内，投票时间："+ DateUtil.formatDateTime(discussEntity.getStartTime()) +"-"+DateUtil.formatDateTime(discussEntity.getEndTime());
      }
      if (StringUtils.isNotBlank(topics.getPhone())) {
         if (StringUtils.isBlank(topics.getCode())) {
            return "验证码不能为空！";
@@ -122,19 +134,13 @@
         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, topicsList.get(0).getHouseCode())
         .eq(HouseholdEntity::getAssociatedUserId, AuthUtil.getUserId())
         .eq(HouseholdEntity::getIsDeleted, 0)
         .last("limit 1"));
      IPublicDiscussService bean = SpringUtil.getBean(IPublicDiscussService.class);
      PublicDiscussEntity discussEntity = bean.getOne(Wrappers.<PublicDiscussEntity>lambdaQuery().eq(PublicDiscussEntity::getArticleId, topicsList.get(0).getArticleId()));
      // 判断是否在开始和结束时间内
      if (discussEntity.getStartTime().getTime() > System.currentTimeMillis() || discussEntity.getEndTime().getTime() < System.currentTimeMillis()) {
         return "目前不在投票时间内";
      }

      // 一户一票
      if (discussEntity.getVoteRestrictions().equals(CommonConstant.NUMBER_ONE)) {
         long count = count(Wrappers.<UserTopicsEntity>lambdaQuery()