From 2ca169c85f61256fb5185c078dba1bfef2be5066 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 11 六月 2025 22:34:11 +0800
Subject: [PATCH] 小程序鉴权处理
---
framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java | 61 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
index 779ff38..d911a32 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java
@@ -1,22 +1,20 @@
package cn.lili.modules.lmk.service.impl;
import cn.lili.base.Result;
+import cn.lili.common.enums.ActivityCoverTypeEnum;
import cn.lili.common.enums.ActivityStatusEnum;
import cn.lili.modules.lmk.domain.entity.Activity;
-import cn.lili.modules.lmk.domain.entity.CustomerBlack;
-import cn.lili.modules.lmk.domain.entity.CustomerTagRef;
import cn.lili.modules.lmk.domain.form.ActivityForm;
-import cn.lili.modules.lmk.domain.form.CustomerTagRefForm;
import cn.lili.modules.lmk.domain.query.ActivityMembersQuery;
import cn.lili.modules.lmk.domain.query.ActivityQuery;
import cn.lili.modules.lmk.domain.vo.ActivityVO;
-import cn.lili.modules.lmk.domain.vo.CustomerBlackVO;
import cn.lili.modules.lmk.mapper.ActivityMapper;
-import cn.lili.modules.lmk.mapper.CustomerBlackMapper;
+import cn.lili.modules.lmk.mapper.ActivityReportMapper;
import cn.lili.modules.lmk.service.ActivityService;
import cn.lili.modules.lmk.service.LmkFileService;
+import cn.lili.modules.lmk.service.MyActivityService;
import cn.lili.modules.member.entity.vo.MemberVO;
-import cn.lili.modules.member.service.MemberService;
+import cn.lili.utils.COSUtil;
import cn.lili.utils.PageUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -34,10 +32,12 @@
@RequiredArgsConstructor
public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> implements ActivityService {
- private final ActivityMapper activityMapper;
-
private final LmkFileService lmkFileService;
+ private final MyActivityService activityService;
+
+ private final ActivityReportMapper activityReportMapper;
+ private final COSUtil cOSUtil;
@Override
public Result add(ActivityForm form) {
@@ -46,6 +46,8 @@
entity.setStatus(ActivityStatusEnum.NOT_STARTED.getType());
//榛樿涓嶄负鎺ㄨ崘
entity.setRecommend(false);
+ //榛樿鏈彂甯�
+ entity.setPublish(false);
baseMapper.insert(entity);
return Result.ok("娣诲姞鎴愬姛");
@@ -56,7 +58,7 @@
Activity entity = baseMapper.selectById(form.getId());
//鍒ゆ柇淇敼鍓嶇殑灏侀潰绫诲瀷鏄惁涓烘枃鏈紝鏂囨湰涓嶉渶瑕佸垹闄ゆ枃浠�
- if (!"鏂囧瓧".equals(entity.getCoverType())){
+ if (!ActivityCoverTypeEnum.TEXT.getType().equals(entity.getCoverType())){
//鍒ゆ柇璺緞鏄惁鏀瑰彉
if (!form.getCover().equals(entity.getCover())) {
//鍒犻櫎浜戞湇鍔″櫒涓棫鐨勫浘鐗�
@@ -72,10 +74,6 @@
return Result.ok("淇敼鎴愬姛");
}
- public void updateByList(List<Activity> vo){
-
- }
-
@Override
public Result remove(List<String> ids) {
baseMapper.deleteBatchIds(ids);
@@ -84,12 +82,15 @@
@Override
public Result removeById(String id) {
+ //TODO 鍏堝垽鏂椿鍔ㄦ槸鍚︽湁鎶ュ悕浜哄憳
+ //鏈夌殑璇濅笉鍙垹闄� 鑱斾腑闂磋〃鏌ヨ
//鍒犻櫎锛屽悓鏃跺垽鏂瀵硅薄鐨勫皝闈㈡槸鍚﹀瓨鍦� 锛屽瓨鍦ㄥ垯鍦ㄤ簯鏈嶅姟鍣ㄥ垹闄�
ActivityVO vo = baseMapper.getById(id);
if (StringUtils.isNotEmpty(vo.getCover())){
lmkFileService.deleteObject(vo.getCover());
}
baseMapper.deleteById(id);
+
return Result.ok("鍒犻櫎鎴愬姛");
}
@@ -99,9 +100,8 @@
baseMapper.getPage(page, query);
for (ActivityVO vo : page.getRecords()) {
- if (!"鏂囧瓧".equals(vo.getCoverType())){
- String url = lmkFileService.getPreviewUrl(vo.getCover());
- vo.setUrl(url);
+ if (!ActivityCoverTypeEnum.TEXT.getType().equals(vo.getCoverType())){
+ vo.setUrl(cOSUtil.getPreviewUrl(vo.getCover()));
}
}
return Result.ok().data(page.getRecords()).total(page.getTotal());
@@ -113,14 +113,28 @@
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
return Result.ok().data(vo);
}
+ @Override
+ public Result getCanReportPage(ActivityQuery query){
+ IPage<ActivityVO> page = PageUtil.getPage(query, ActivityVO.class);
+ //宸插彂甯冪殑娲诲姩
+ baseMapper.getCanReportPage(page, query);
+
+ for(ActivityVO activityVO : page.getRecords()){
+ activityVO.setUrl(cOSUtil.getPreviewUrl(activityVO.getCover()));
+ }
+
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
+ }
@Override
public Result all() {
+
List<Activity> entities = baseMapper.selectList(null);
List<ActivityVO> vos = entities.stream()
.map(entity -> ActivityVO.getVoByEntity(entity, null))
.collect(Collectors.toList());
- return Result.ok().data(vos);
+ List<ActivityVO> reportActivityVo =vos.stream().filter(item -> ActivityStatusEnum.REPORT.getType().equals(item.getStatus())).collect(Collectors.toList());
+ return Result.ok().data(reportActivityVo);
}
@Override
@@ -141,7 +155,16 @@
@Override
public Result activityChangeStatus(ActivityForm form) {
Activity entity = baseMapper.selectById(form.getId());
- entity.setStatus(form.getStatus());
+ entity.setPublish(form.getPublish());
+ if (!form.getPublish()){
+ //涓嬫灦鍒ゆ柇鏄惁鏈変汉鍛樻姤鍚嶏紝鏈夋姤鍚嶇殑璇濈姝㈡彁閱掓棤娉曚笅鏋�
+ ActivityMembersQuery activityMembersQuery = new ActivityMembersQuery();
+ activityMembersQuery.setId(form.getId());
+ if((long)activityMembersPage(activityMembersQuery).get("total") > 0){
+ return Result.error("璇ユ椿鍔ㄦ棤娉曚笅鏋讹紝宸插瓨鍦ㄦ姤鍚嶄汉鍛�");
+ }
+
+ }
baseMapper.updateById(entity);
return Result.ok();
}
@@ -160,4 +183,6 @@
baseMapper.getMembers(page, query);
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
+
+
}
--
Gitblit v1.8.0