From 96430c55ed811fc770ac6653701e2e4b7ab283e4 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Mon, 13 Jun 2022 17:08:33 +0800 Subject: [PATCH 1/5] zh --- .../controller/manage/TopicActivityController.java | 8 +++++++- .../com/zh/project0512/model/QywxDepartmentUserLink.java | 2 ++ src/main/java/com/zh/project0512/model/Reference.java | 2 +- .../serviceImpl/CustomerActionNoteServiceImpl.java | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) 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/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); From c8e9aab6d01953800eb3245b742ab03f834c2916 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Mon, 13 Jun 2022 17:33:43 +0800 Subject: [PATCH 2/5] zh --- .../controller/manage/ReferenceController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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..7590d3e 100644 --- a/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java +++ b/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java @@ -53,6 +53,18 @@ public class ReferenceController { @Autowired private IReferenceBrandService referenceBrandService; + @Data + static class AddRParam { + @NotNull(message = "id不能为空") + @Min(value = 1, message = "id最小值为1") + @Schema(title = "素材id") + private String title; + @NotNull(message = "tagId不能为空") + @Min(value = 1, message = "tagId最小值为1") + @Schema(title = "标签id") + private Integer tagId; + } + @Operation(summary = "添加素材") @PostMapping("/add") @adminTokenValid From ff5ef83464218455aa75602b5c7d5981c0cd3448 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Mon, 13 Jun 2022 17:37:22 +0800 Subject: [PATCH 3/5] zh --- .../zh/project0512/controller/wxApp/UserPointsController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 9168d63..b161a44 100644 --- a/src/main/java/com/zh/project0512/controller/wxApp/UserPointsController.java +++ b/src/main/java/com/zh/project0512/controller/wxApp/UserPointsController.java @@ -31,7 +31,7 @@ public class UserPointsController { * @return 用户积分详情 */ @Operation(summary = "用户积分详情") - @PostMapping("/pointsDetail") + @PostMapping("/detail") @tokenValid public Result pointsDetail(@RequestHeader String token){ String openid = new JwtUtil().parseOpenid(token); @@ -52,3 +52,4 @@ public class UserPointsController { } } + From 16daadce506267952c82333a90204b782057bd25 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Mon, 13 Jun 2022 18:43:08 +0800 Subject: [PATCH 4/5] zh --- .../manage/ReferenceController.java | 40 +++++++++++++------ .../serviceImpl/RankServiceImpl.java | 5 ++- 2 files changed, 31 insertions(+), 14 deletions(-) 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 7590d3e..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; /** @@ -55,25 +59,35 @@ public class ReferenceController { @Data static class AddRParam { - @NotNull(message = "id不能为空") - @Min(value = 1, message = "id最小值为1") - @Schema(title = "素材id") + @NotNull(message = "标题不能为空") + @Schema(title = "标题") private String title; - @NotNull(message = "tagId不能为空") - @Min(value = 1, message = "tagId最小值为1") - @Schema(title = "标签id") - private Integer tagId; + @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/serviceImpl/RankServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java index 15a2bbf..37d69f3 100644 --- a/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java +++ b/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java @@ -13,6 +13,8 @@ import com.zh.project0512.utils.page.PageInfo; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -34,11 +36,12 @@ public class RankServiceImpl implements IRankService { cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); cal.set(Calendar.MILLISECOND,0); + LocalDate now = LocalDate.now(); Date time = cal.getTime(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("type",rankListDTO.getType()); - queryWrapper.eq("dateStart",time); + queryWrapper.eq("dateStart", now.atStartOfDay()); Page page = new Page<>(rankListDTO.getPageNum(), rankListDTO.getPageSize()); IPage rankIPage = rankMapper.selectPage(page, queryWrapper); List records = rankIPage.getRecords(); From 145adce22c8ebc0bd217e3fe39606989361f833f Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Mon, 13 Jun 2022 18:44:41 +0800 Subject: [PATCH 5/5] zh --- .../serviceImpl/RankServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java b/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java index 37d69f3..bc34d46 100644 --- a/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java +++ b/src/main/java/com/zh/project0512/serviceImpl/RankServiceImpl.java @@ -28,16 +28,16 @@ public class RankServiceImpl implements IRankService { @Override public PageInfo rankList(RankListDTO rankListDTO) { ArrayList rankListVoList = new ArrayList<>(); - Calendar cal = Calendar.getInstance(); - cal.setTime(new Date()); - cal.add(Calendar.MONTH,-1); - cal.set(Calendar.DAY_OF_MONTH,1); - cal.set(Calendar.HOUR_OF_DAY, 0); - cal.set(Calendar.MINUTE, 0); - cal.set(Calendar.SECOND, 0); - cal.set(Calendar.MILLISECOND,0); - LocalDate now = LocalDate.now(); - Date time = cal.getTime(); +// Calendar cal = Calendar.getInstance(); +// cal.setTime(new Date()); +// cal.add(Calendar.MONTH,-1); +// cal.set(Calendar.DAY_OF_MONTH,1); +// cal.set(Calendar.HOUR_OF_DAY, 0); +// cal.set(Calendar.MINUTE, 0); +// cal.set(Calendar.SECOND, 0); +// cal.set(Calendar.MILLISECOND,0); +// Date time = cal.getTime(); + LocalDate now = LocalDate.now().minusMonths(1); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("type",rankListDTO.getType());