diff --git a/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java b/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java index 3876b56..0dc5965 100644 --- a/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java +++ b/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java @@ -2,6 +2,7 @@ package com.zh.project0512.controller.manage; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -32,6 +33,9 @@ import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; import java.time.LocalDateTime; import java.time.LocalTime; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.List; /** @@ -53,15 +57,37 @@ public class ReferenceController { @Autowired private IReferenceBrandService referenceBrandService; + @Data + static class AddRParam { + @NotNull(message = "标题不能为空") + @Schema(title = "标题") + private String title; + @Schema(title = "素材分组id",description = "0为未分组") + private Integer groupId; + @Schema(title = "文件地址列表") + @NotNull(message = "fileUrl不能为空") + private List fileUrlList; + @Schema(title = "封面图片地址",description = "视频文件请上传封面图片") + private String coverUrl; + @Schema(title = "标签id列表") + private List tagList; + @Schema(title = "品牌id列表") + private List brandList; + } + @Operation(summary = "添加素材") @PostMapping("/add") @adminTokenValid - public Result add(@Validated @RequestBody Reference reference) { - String fileName = reference.getFileUrl(); - reference.setType(FileTypeUtil.getcontentTypeNum(fileName.substring(fileName.lastIndexOf(".")))); - referenceService.save(reference.setCreatAt(LocalDateTime.now())); - referenceTagService.addGroup(reference.getTagList(), reference.getId()); - referenceBrandService.addGroup(reference.getBrandList(), reference.getId()); + public Result add(@Validated @RequestBody AddRParam param) { + List list = param.getFileUrlList(); + Reference reference = new Reference().setTitle(param.getTitle()).setGroupId(param.getGroupId()).setCoverUrl(param.getCoverUrl()); + List l = new ArrayList<>(); + for(String e :list){ + l.add(reference.setFileUrl(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf("."))))); + } + referenceService.saveBatch(l); +// referenceTagService.addGroup(reference.getTagList(), reference.getId()); +// referenceBrandService.addGroup(reference.getBrandList(), reference.getId()); return Result.success("添加完成!"); } diff --git a/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java b/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java index 9903751..d395e4e 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java @@ -55,13 +55,19 @@ public class TopicActivityController { private String content; @Schema(title = "封面") private String cover; + @Schema(title = "是否首页显示",description = "0否;1是") + private Integer showAtIndex; } @Operation(summary = "新增动态") @PostMapping("/add") @adminTokenValid public Result add(@Validated @RequestBody AddTopicParam param) { - topicActivityService.save(new TopicActivity().setTitle(param.getTitle()).setType(param.getType()).setContent(param.getContent()).setCover(param.getCover()).setCreatAt(LocalDateTime.now())); + TopicActivity topicActivity = new TopicActivity().setTitle(param.getTitle()).setType(param.getType()).setContent(param.getContent()).setCover(param.getCover()).setCreatAt(LocalDateTime.now()); + if(param.getShowAtIndex() == 1){ + topicActivity.setShowAtIndex(1); + } + topicActivityService.save(topicActivity); return Result.success("添加完成"); } diff --git a/src/main/java/com/zh/project0512/controller/wxApp/UserPointsController.java b/src/main/java/com/zh/project0512/controller/wxApp/UserPointsController.java index 91805cf..b161a44 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/UserPointsController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/UserPointsController.java @@ -52,3 +52,4 @@ public class UserPointsController { } } + diff --git a/src/main/java/com/zh/project0512/model/QywxDepartmentUserLink.java b/src/main/java/com/zh/project0512/model/QywxDepartmentUserLink.java index ce22dbd..46a0908 100644 --- a/src/main/java/com/zh/project0512/model/QywxDepartmentUserLink.java +++ b/src/main/java/com/zh/project0512/model/QywxDepartmentUserLink.java @@ -3,6 +3,7 @@ package com.zh.project0512.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -15,6 +16,7 @@ import java.io.Serializable; @Data @NoArgsConstructor @AllArgsConstructor +@TableName("qywxDepartmentUserLink") public class QywxDepartmentUserLink implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/zh/project0512/model/Reference.java b/src/main/java/com/zh/project0512/model/Reference.java index 96a3322..3ed5593 100644 --- a/src/main/java/com/zh/project0512/model/Reference.java +++ b/src/main/java/com/zh/project0512/model/Reference.java @@ -64,7 +64,7 @@ public class Reference extends Model { /** * 封面图片地址 */ - @Schema(title = "封面图片地址") + @Schema(title = "封面图片地址",description = "视频文件请上传封面图片") @TableField("coverUrl") private String coverUrl; diff --git a/src/main/java/com/zh/project0512/serviceImpl/CustomerActionNoteServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/CustomerActionNoteServiceImpl.java index 8f00084..89c38b7 100644 --- a/src/main/java/com/zh/project0512/serviceImpl/CustomerActionNoteServiceImpl.java +++ b/src/main/java/com/zh/project0512/serviceImpl/CustomerActionNoteServiceImpl.java @@ -111,7 +111,7 @@ public class CustomerActionNoteServiceImpl extends ServiceImpl queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.eq("type",1); + queryWrapper2.eq("type",type); queryWrapper2.eq("userId",userId); queryWrapper2.select("IFNULL(SUM(playNum),0) as playNum,IFNULL(SUM(commendNum),0) as commendNum,IFNULL(SUM(collectionNum),0) as collectionNum,IFNULL(SUM(commentNum),0) as commentNum,IFNULL(SUM(reSendNum),0) as reSendNum,IFNULL(SUM(recommendNum),0) as recommendNum"); return videoMapper.selectOne(queryWrapper2);