|
|
@@ -30,11 +30,15 @@ import java.util.LinkedHashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.HashMap;
|
|
|
+import java.util.Set;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
|
public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> implements UserPlanService {
|
|
|
|
|
|
+ private static final int MODE_TYPE_MASTER = 4;
|
|
|
+ private static final int PLAN_STATUS_PUBLISHED = 1;
|
|
|
+
|
|
|
@Autowired
|
|
|
private PlanMapper planMapper;
|
|
|
|
|
|
@@ -52,9 +56,10 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
|
|
|
}
|
|
|
|
|
|
ensureRequiredPlans(userId);
|
|
|
- List<UserPlan> allPlans = lambdaQuery()
|
|
|
+ List<UserPlan> userPlans = lambdaQuery()
|
|
|
.eq(UserPlan::getUserId, userId)
|
|
|
- .list()
|
|
|
+ .list();
|
|
|
+ List<UserPlan> allPlans = filterVisibleUserPlans(userPlans)
|
|
|
.stream()
|
|
|
.peek(this::normalizeCreator)
|
|
|
.collect(Collectors.toList());
|
|
|
@@ -99,6 +104,7 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
|
|
|
if (userPlan == null) {
|
|
|
throw new BusinessException(ResultCode.USER_PLAN_NOT_FOUND);
|
|
|
}
|
|
|
+ checkUserPlanVisible(userPlan);
|
|
|
normalizeCreator(userPlan);
|
|
|
fillEffectType(userPlan);
|
|
|
List<PlanStep> steps = getPlanSteps(userPlan.getPlanId());
|
|
|
@@ -107,6 +113,54 @@ public class UserPlanServiceImpl extends ServiceImpl<UserPlanMapper, UserPlan> i
|
|
|
return userPlan;
|
|
|
}
|
|
|
|
|
|
+ private List<UserPlan> filterVisibleUserPlans(List<UserPlan> userPlans) {
|
|
|
+ if (userPlans == null || userPlans.isEmpty()) {
|
|
|
+ return new ArrayList<>();
|
|
|
+ }
|
|
|
+ List<Long> masterPlanIds = userPlans.stream()
|
|
|
+ .filter(this::isMasterUserPlan)
|
|
|
+ .map(UserPlan::getPlanId)
|
|
|
+ .filter(id -> id != null)
|
|
|
+ .distinct()
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ if (masterPlanIds.isEmpty()) {
|
|
|
+ return userPlans;
|
|
|
+ }
|
|
|
+
|
|
|
+ Set<Long> visibleMasterPlanIds = planMapper.selectList(new LambdaQueryWrapper<Plan>()
|
|
|
+ .in(Plan::getId, masterPlanIds)
|
|
|
+ .eq(Plan::getModeType, MODE_TYPE_MASTER)
|
|
|
+ .eq(Plan::getStatus, PLAN_STATUS_PUBLISHED))
|
|
|
+ .stream()
|
|
|
+ .map(Plan::getId)
|
|
|
+ .collect(Collectors.toSet());
|
|
|
+
|
|
|
+ return userPlans.stream()
|
|
|
+ .filter(userPlan -> !isMasterUserPlan(userPlan)
|
|
|
+ || (userPlan.getPlanId() != null && visibleMasterPlanIds.contains(userPlan.getPlanId())))
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ }
|
|
|
+
|
|
|
+ private void checkUserPlanVisible(UserPlan userPlan) {
|
|
|
+ if (!isMasterUserPlan(userPlan)) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ Plan plan = userPlan.getPlanId() == null ? null : planMapper.selectById(userPlan.getPlanId());
|
|
|
+ if (!isPublishedMasterPlan(plan)) {
|
|
|
+ throw new BusinessException(ResultCode.USER_PLAN_NOT_FOUND);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ private boolean isMasterUserPlan(UserPlan userPlan) {
|
|
|
+ return userPlan != null && Integer.valueOf(MODE_TYPE_MASTER).equals(userPlan.getModeType());
|
|
|
+ }
|
|
|
+
|
|
|
+ private boolean isPublishedMasterPlan(Plan plan) {
|
|
|
+ return plan != null
|
|
|
+ && Integer.valueOf(MODE_TYPE_MASTER).equals(plan.getModeType())
|
|
|
+ && Integer.valueOf(PLAN_STATUS_PUBLISHED).equals(plan.getStatus());
|
|
|
+ }
|
|
|
+
|
|
|
private void ensureRequiredPlans(Long userId) {
|
|
|
List<UserPlan> existingPlans = lambdaQuery()
|
|
|
.eq(UserPlan::getUserId, userId)
|