Browse Source

fix: Optimize user

master
wangxiang 1 year ago
parent
commit
3f572859be
  1. 10
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanController.java

10
kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushConcernFanController.java

@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.api.R;
import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.constant.AppConstants;
import com.cloud.kicc.common.security.annotation.Inner;
import com.cloud.kicc.commonbiz.api.entity.*; import com.cloud.kicc.commonbiz.api.entity.*;
import com.cloud.kicc.commonbiz.api.enums.PushAuditStatusEnum; import com.cloud.kicc.commonbiz.api.enums.PushAuditStatusEnum;
import com.cloud.kicc.commonbiz.api.enums.PushConcernTypeEnum; import com.cloud.kicc.commonbiz.api.enums.PushConcernTypeEnum;
@ -18,10 +17,7 @@ import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.Arrays; import java.util.*;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -87,7 +83,7 @@ public class PushConcernFanController {
.eq(PushConcernFanType::getFanUserId, pushConcernFan.getFanUserId())); .eq(PushConcernFanType::getFanUserId, pushConcernFan.getFanUserId()));
iPushConcernFanService.save(pushConcernFan); iPushConcernFanService.save(pushConcernFan);
// 同步推送类型 // 同步推送类型
if (pushConcernFan.getStatus() == PushAuditStatusEnum.APPROVED.getValue()) { if (Objects.equals(pushConcernFan.getStatus(), PushAuditStatusEnum.APPROVED.getValue())) {
List<PushType> pushTypes = iPushTypeService.list(Wrappers.<PushType>lambdaQuery().eq(PushType::getCreateById, pushConcernFan.getConcernUserId())); List<PushType> pushTypes = iPushTypeService.list(Wrappers.<PushType>lambdaQuery().eq(PushType::getCreateById, pushConcernFan.getConcernUserId()));
List<PushConcernFanType> pushConcernFanTypes = pushTypes.stream().map(item -> new PushConcernFanType() List<PushConcernFanType> pushConcernFanTypes = pushTypes.stream().map(item -> new PushConcernFanType()
.setName(item.getName()) .setName(item.getName())
@ -170,7 +166,7 @@ public class PushConcernFanController {
iPushConcernFanService.update(Wrappers.<PushConcernFan>lambdaUpdate() iPushConcernFanService.update(Wrappers.<PushConcernFan>lambdaUpdate()
.set(PushConcernFan::getStatus, status).eq(PushConcernFan::getId, id)); .set(PushConcernFan::getStatus, status).eq(PushConcernFan::getId, id));
// 同步推送类型 // 同步推送类型
if (status == PushAuditStatusEnum.APPROVED.getValue()) { if (Objects.equals(status, PushAuditStatusEnum.APPROVED.getValue())) {
PushConcernFan pushConcernFan = iPushConcernFanService.getById(id); PushConcernFan pushConcernFan = iPushConcernFanService.getById(id);
// 考虑:先删除数据在新增,防止安卓不做限制能多次关注导致脏数据 // 考虑:先删除数据在新增,防止安卓不做限制能多次关注导致脏数据
iPushConcernFanTypeService.remove(Wrappers.<PushConcernFanType>lambdaQuery() iPushConcernFanTypeService.remove(Wrappers.<PushConcernFanType>lambdaQuery()

Loading…
Cancel
Save