From 5f3d32ad7f8106805dc70332143b0007af63e209 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 02 三月 2026 11:09:57 +0800
Subject: [PATCH] 优化
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
index 1c29729..cd6bd02 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.api;
+import cn.hutool.crypto.SecureUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -97,16 +98,17 @@
@PostMapping("/getMicroWishList")
public R<Page<TMicroWish>> getMicroWishList(@RequestBody MicroWishListQuery query) {
Page<TMicroWish> page = new Page<>(query.getPageNum(), query.getPageSize());
- Page<TMicroWish> tMicroWishPage = tMicroWishService.page(page, new LambdaQueryWrapper<TMicroWish>().eq(TMicroWish::getWishType, 1).eq(TMicroWish::getState,1).eq(TMicroWish::getStatus, 2).like(Objects.nonNull(query.getWishDescription()), TMicroWish::getWishDescription, query.getWishDescription()).orderByDesc(BaseModel::getCreateTime));
+ Page<TMicroWish> tMicroWishPage = tMicroWishService.page(page, new LambdaQueryWrapper<TMicroWish>().eq(TMicroWish::getWishType, 1).eq(TMicroWish::getState, 1).eq(TMicroWish::getStatus, 2).like(Objects.nonNull(query.getWishDescription()), TMicroWish::getWishDescription, query.getWishDescription()).orderByDesc(BaseModel::getCreateTime));
List<TMicroWish> records = tMicroWishPage.getRecords();
List<String> appUserIds = records.stream().map(TMicroWish::getAppUserId).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(appUserIds)){
+ if (!CollectionUtils.isEmpty(appUserIds)) {
List<TAppUser> appUsers = appUserService.list(Wrappers.lambdaQuery(TAppUser.class)
.in(TAppUser::getId, appUserIds));
for (TMicroWish microWish : records) {
List<TAppUser> appUserList = appUsers.stream().filter(appUser -> microWish.getAppUserId().equals(appUser.getId())).collect(Collectors.toList());
- if(!CollectionUtils.isEmpty(appUserList)){
+ if (!CollectionUtils.isEmpty(appUserList)) {
microWish.setUserName(appUserList.get(0).getNickName());
+ microWish.setAvatar(appUserList.get(0).getAvatar());
}
}
}
@@ -120,9 +122,9 @@
public R<?> addMicroWish(@RequestBody TMicroWish dto) {
String userId = tokenService.getLoginUserApplet().getUserId();
dto.setAppUserId(userId);
- if(dto.getWishType() == 1){
+ if (dto.getWishType() == 1) {
dto.setStatus(1);
- }else {
+ } else {
dto.setStatus(4);
}
tMicroWishService.save(dto);
@@ -142,17 +144,17 @@
Page<TCommunityActivity> tCommunityActivityPage = tCommunityActivityService.page(page, new LambdaQueryWrapper<TCommunityActivity>().eq(TCommunityActivity::getStatus, 2).like(Objects.nonNull(query.getName()), TCommunityActivity::getActivityTitle, query.getName()).orderByDesc(BaseModel::getCreateTime));
List<TCommunityActivity> activityList = tCommunityActivityPage.getRecords();
// 判断是否已经报名
- if (!activityList.isEmpty() && userId != null) {
+ if (!activityList.isEmpty()) {
List<String> activityIds = activityList.stream().map(TCommunityActivity::getId).collect(Collectors.toList());
- List<TCommunityActivityRegistration> activityRegistrationList = tCommunityActivityRegistrationService.list(new LambdaQueryWrapper<TCommunityActivityRegistration>().in(TCommunityActivityRegistration::getActivityId, activityIds).eq(TCommunityActivityRegistration::getAppUserId, userId));
+ List<TCommunityActivityRegistration> activityRegistrationList = tCommunityActivityRegistrationService.list(new LambdaQueryWrapper<TCommunityActivityRegistration>().in(TCommunityActivityRegistration::getActivityId, activityIds));
for (TCommunityActivity tCommunityActivity : activityList) {
List<TCommunityActivityRegistration> tCommunityActivityRegistrations = activityRegistrationList.stream().filter(e -> e.getActivityId().equals(tCommunityActivity.getId())).collect(Collectors.toList());
tCommunityActivity.setUserNum(tCommunityActivityRegistrations.size());
String finalUserId = userId;
- TCommunityActivityRegistration tCommunityActivityRegistration = tCommunityActivityRegistrations.stream().filter(e -> e.getAppUserId().equals(finalUserId)).findFirst().orElse(null);
- if (tCommunityActivityRegistration != null) {
- tCommunityActivity.setState(2);
+ if (finalUserId != null) {
+
}
+
}
}
@@ -173,11 +175,12 @@
userId = tokenService.getLoginUserApplet().getUserId();
} catch (Exception e) {
}
- if (userId != null) {
- long count = tCommunityActivityRegistrationService.count(new LambdaQueryWrapper<TCommunityActivityRegistration>().eq(TCommunityActivityRegistration::getActivityId, id).eq(TCommunityActivityRegistration::getAppUserId, userId));
- if (count > 0) {
- tCommunityActivity.setState(2);
- }
+ long count = tCommunityActivityRegistrationService.count(new LambdaQueryWrapper<TCommunityActivityRegistration>().eq(TCommunityActivityRegistration::getActivityId, id));
+ if (count > 0) {
+ tCommunityActivity.setUserNum((int) count);
+ }
+ if(userId!=null){
+ tCommunityActivity.setState(tCommunityActivityRegistrationService.count(new LambdaQueryWrapper<TCommunityActivityRegistration>().eq(TCommunityActivityRegistration::getActivityId, id).eq(TCommunityActivityRegistration::getAppUserId, userId)) > 0 ? 1 : 2);
}
return R.ok(tCommunityActivity);
}
@@ -252,6 +255,11 @@
return R.ok(tDeliberationVotePage);
}
+ public static void main(String[] args) {
+ String s = SecureUtil.md5("123456");
+ System.out.println(s);
+ }
+
@ApiOperation(value = "议事投票--详情", response = TDeliberationVote.class)
@GetMapping("/getDeliberationVoteDetail/{id}")
public R<TDeliberationVote> getDeliberationVoteDetail(@PathVariable String id) {
@@ -300,7 +308,7 @@
List<TDeliberationVoteOption> list = tDeliberationVoteOptionService.list(new LambdaQueryWrapper<TDeliberationVoteOption>().eq(TDeliberationVoteOption::getVoteId, dto.getVoteId()));
for (TDeliberationVoteOption tDeliberationVoteOption : list) {
String voteCount = tDeliberationVoteOption.getVoteCount();
- if(voteCount != null){
+ if (voteCount != null) {
String[] split = voteCount.split(",");
if (Arrays.asList(split).contains(userId)) {
return R.fail("你已经投票");
--
Gitblit v1.7.1