From 861582390dc7c395897159077a547d3e7078727c Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 11 六月 2025 10:59:52 +0800
Subject: [PATCH] 活动页面发布接口，新增接口字段中文问题，文件url后端调用
---
framework/src/main/java/cn/lili/common/enums/ActivityStatusEnum.java | 17 +++--
framework/src/main/java/cn/lili/common/enums/ActivityCoverTypeEnum.java | 19 ++++++
framework/src/main/java/cn/lili/modules/lmk/domain/entity/Activity.java | 4 +
framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java | 4 +
framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java | 6 ++
framework/src/main/java/cn/lili/modules/lmk/service/impl/ActivityServiceImpl.java | 37 ++++++++----
framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java | 39 +++++++++---
framework/src/main/resources/mapper/lmk/ActivityMapper.xml | 11 ++-
8 files changed, 103 insertions(+), 34 deletions(-)
diff --git a/framework/src/main/java/cn/lili/common/enums/ActivityCoverTypeEnum.java b/framework/src/main/java/cn/lili/common/enums/ActivityCoverTypeEnum.java
new file mode 100644
index 0000000..97c0f79
--- /dev/null
+++ b/framework/src/main/java/cn/lili/common/enums/ActivityCoverTypeEnum.java
@@ -0,0 +1,19 @@
+package cn.lili.common.enums;
+
+import lombok.Getter;
+
+@Getter
+public enum ActivityCoverTypeEnum {
+ VIDEO("video","瑙嗛"),
+ IMAGE("image","鍥剧墖"),
+ TEXT("text","鏂囧瓧");
+
+ private String type;
+
+ private String desc;
+
+ ActivityCoverTypeEnum(String type,String desc) {
+ this.type = type;
+ this.desc = desc;
+ }
+}
diff --git a/framework/src/main/java/cn/lili/common/enums/ActivityStatusEnum.java b/framework/src/main/java/cn/lili/common/enums/ActivityStatusEnum.java
index 35816f1..59fd598 100644
--- a/framework/src/main/java/cn/lili/common/enums/ActivityStatusEnum.java
+++ b/framework/src/main/java/cn/lili/common/enums/ActivityStatusEnum.java
@@ -4,16 +4,21 @@
@Getter
public enum ActivityStatusEnum {
- NOT_STARTED("鏈紑濮�"),
- REPORT("鎶ュ悕涓�"),
- IN_PROGRESS("杩涜涓�"),
- ENDED("宸茬粨鏉�");
+ UNPUBLISH("unPublish","鏈彂甯�"),
+ PUBLISH("publish","宸插彂甯�"),
+ TAKE_DOWN("takeDown","宸蹭笅鏋�"),
+
+ NOT_STARTED("noStart","鏈紑濮�"),
+ REPORT("report","鎶ュ悕涓�"),
+ IN_PROGRESS("inProgress","杩涜涓�"),
+ ENDED("end","宸茬粨鏉�");
private String type;
- ActivityStatusEnum(String type) {
+ private String desc;
+ ActivityStatusEnum(String type, String desc) {
this.type = type;
-
+ this.desc = desc;
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/Activity.java b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/Activity.java
index a3b7c91..270b95d 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/entity/Activity.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/entity/Activity.java
@@ -68,6 +68,8 @@
@TableField("activity_content")
private String activityContent;
-
+ /** 鍒ゆ柇鏄惁鍙戝竷*/
+ @TableField("publish")
+ private Boolean publish;
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java b/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java
index e039cc6..c129ee2 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityForm.java
@@ -92,6 +92,10 @@
@ApiModelProperty(value = "娲诲姩璇︾粏鍐呭锛堟敮鎸佸瘜鏂囨湰锛�", example = "<p>娲诲姩娴佺▼锛�...</p>")
private String activityContent;
+ /** 娲诲姩鍙戝竷 */
+ @ApiModelProperty(value = "娲诲姩鍙戝竷", example = "")
+ private Boolean publish;
+
public static Activity getEntityByForm(@NonNull ActivityForm form, Activity entity) {
if(entity == null) {
entity = new Activity();
diff --git a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java
index bcb6689..2dd298f 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/domain/vo/ActivityVO.java
@@ -90,6 +90,12 @@
private Boolean isReport;
/**
+ * 鏄惁鍙戝竷
+ */
+ private Boolean publish;
+
+
+ /**
* 鏄惁鏀惰棌
*/
private Boolean isCollect;
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 cd97862..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,6 +1,7 @@
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.form.ActivityForm;
@@ -13,6 +14,7 @@
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.utils.COSUtil;
import cn.lili.utils.PageUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -35,6 +37,7 @@
private final MyActivityService activityService;
private final ActivityReportMapper activityReportMapper;
+ private final COSUtil cOSUtil;
@Override
public Result add(ActivityForm form) {
@@ -43,6 +46,8 @@
entity.setStatus(ActivityStatusEnum.NOT_STARTED.getType());
//榛樿涓嶄负鎺ㄨ崘
entity.setRecommend(false);
+ //榛樿鏈彂甯�
+ entity.setPublish(false);
baseMapper.insert(entity);
return Result.ok("娣诲姞鎴愬姛");
@@ -53,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())) {
//鍒犻櫎浜戞湇鍔″櫒涓棫鐨勫浘鐗�
@@ -79,10 +84,6 @@
public Result removeById(String id) {
//TODO 鍏堝垽鏂椿鍔ㄦ槸鍚︽湁鎶ュ悕浜哄憳
//鏈夌殑璇濅笉鍙垹闄� 鑱斾腑闂磋〃鏌ヨ
-
-
-
-
//鍒犻櫎锛屽悓鏃跺垽鏂瀵硅薄鐨勫皝闈㈡槸鍚﹀瓨鍦� 锛屽瓨鍦ㄥ垯鍦ㄤ簯鏈嶅姟鍣ㄥ垹闄�
ActivityVO vo = baseMapper.getById(id);
if (StringUtils.isNotEmpty(vo.getCover())){
@@ -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());
@@ -116,8 +116,13 @@
@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());
}
@@ -129,9 +134,6 @@
.map(entity -> ActivityVO.getVoByEntity(entity, null))
.collect(Collectors.toList());
List<ActivityVO> reportActivityVo =vos.stream().filter(item -> ActivityStatusEnum.REPORT.getType().equals(item.getStatus())).collect(Collectors.toList());
-
-
-
return Result.ok().data(reportActivityVo);
}
@@ -153,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();
}
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java
index 4238205..fb4f416 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/MyActivityServiceImpl.java
@@ -1,10 +1,13 @@
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.common.security.context.UserContext;
import cn.lili.common.utils.StringUtils;
import cn.lili.modules.lmk.domain.entity.Activity;
import cn.lili.modules.lmk.domain.entity.ActivityReport;
+import cn.lili.modules.lmk.domain.entity.MyCollect;
import cn.lili.modules.lmk.domain.form.ActivityReportForm;
import cn.lili.modules.lmk.domain.query.ActivityReportQuery;
import cn.lili.modules.lmk.domain.query.MyActivityQuery;
@@ -13,7 +16,9 @@
import cn.lili.modules.lmk.domain.vo.MyActivityVo;
import cn.lili.modules.lmk.mapper.ActivityMapper;
import cn.lili.modules.lmk.mapper.ActivityReportMapper;
+import cn.lili.modules.lmk.mapper.MyCollectMapper;
import cn.lili.modules.lmk.service.MyActivityService;
+import cn.lili.utils.COSUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
@@ -35,13 +40,18 @@
private final ActivityMapper activityMapper;
private final ActivityReportMapper activityReportMapper;
-
+ private final COSUtil cOSUtil;
+ private final MyCollectMapper myCollectMapper;
@Override
public Result getMyActivityList(MyActivityQuery query) {
String userId = UserContext.getCurrentUserId();
List<MyActivityVo> myActivityList = activityMapper.getMyActivityList(query,userId);
-
+ for (MyActivityVo myActivityVo : myActivityList){
+ if (!ActivityCoverTypeEnum.TEXT.getType().equals(myActivityVo.getCoverType())){
+ myActivityVo.setUrl(cOSUtil.getPreviewUrl(myActivityVo.getCover()));
+ }
+ }
return Result.ok().data(myActivityList);
}
@@ -107,26 +117,35 @@
*/
@Override
public ActivityReportVO userReport(String activityId){
-
if (UserContext.getCurrentUserId() == null || UserContext.getCurrentUserId().isEmpty()){
throw new RuntimeException("鐢ㄦ埛鐧诲綍鐘舵�佸紓甯�");
}
return activityReportMapper.getActivityReport(activityId,UserContext.getCurrentUserId());
}
+ /**鑾峰緱娲诲姩璇︽儏 骞� 娲诲姩璐﹀彿鎶ュ悕娲诲姩鎯呭喌锛屾敹钘忔儏鍐�
+ *
+ * @param activityId
+ * @return
+ */
@Override
public Result detailByUsr(String activityId) {
+ //鏌ヨ娲诲姩璇︽儏
ActivityVO vo = baseMapper.getById(activityId);
Assert.notNull(vo, "璁板綍涓嶅瓨鍦�");
-
+ //鏌ヨ鎶ュ悕鎯呭喌
ActivityReportVO reportVO = userReport(activityId);
-
- ActivityReport activityReport = new LambdaQueryChainWrapper<>(activityReportMapper)
- .eq(ActivityReport::getUserId, UserContext.getCurrentUserId())
- .eq(ActivityReport::getDeleteFlag,0)
- .eq(ActivityReport::getActivityId,activityId)
+ //鏌ヨ鐢ㄦ埛鏀惰棌鎯呭喌
+ MyCollect myCollect = new LambdaQueryChainWrapper<>(myCollectMapper)
+ .eq(MyCollect::getRefId,activityId)
+ .eq(MyCollect::getUserId,UserContext.getCurrentUserId())
+ .eq(MyCollect::getDeleteFlag,false)
.one();
- vo.setIsCollect(activityReport != null);
+ vo.setIsCollect(myCollect != null);
+ if (!ActivityCoverTypeEnum.TEXT.getType().equals(vo.getCoverType())){
+ vo.setUrl(cOSUtil.getPreviewUrl(vo.getCover()));
+ }
+
//鍒欏綋鍓嶇敤鎴锋湭鎶ュ悕
if (reportVO == null){
vo.setIsReport(false);
diff --git a/framework/src/main/resources/mapper/lmk/ActivityMapper.xml b/framework/src/main/resources/mapper/lmk/ActivityMapper.xml
index 832e884..4d7b1aa 100644
--- a/framework/src/main/resources/mapper/lmk/ActivityMapper.xml
+++ b/framework/src/main/resources/mapper/lmk/ActivityMapper.xml
@@ -18,6 +18,7 @@
<result column="limit_user_num" property="limitUserNum" />
<result column="activity_location" property="activityLocation" />
<result column="activity_content" property="activityContent" />
+ <result column="publish" property="publish" />
</resultMap>
<resultMap id="MyActivityResultMap" type="cn.lili.modules.lmk.domain.vo.MyActivityVo">
@@ -54,7 +55,7 @@
AND LAR.user_id = #{userId}
AND LAR.cancel = #{query.cancel}
<if test="query.status == null or query.status == ''">
- AND LA.status != '宸茬粨鏉�'
+ AND LA.status != 'end'
</if>
<if test="query.status != null and query.status != ''">
AND LA.status = #{query.status}
@@ -78,7 +79,8 @@
LA.cover_type,
LA.limit_user_num,
LA.activity_location,
- LA.activity_content
+ LA.activity_content,
+ LA.publish
FROM
lmk_activity LA
WHERE
@@ -101,7 +103,8 @@
LA.cover_type,
LA.limit_user_num,
LA.activity_location,
- LA.activity_content
+ LA.activity_content,
+ LA.publish
FROM
lmk_activity LA
WHERE
@@ -133,7 +136,7 @@
lmk_activity LA
WHERE
LA.delete_flag = 0
- AND LA.status = '鎶ュ悕涓�'
+ AND LA.publish = 1
</select>
--
Gitblit v1.8.0