From 6855aea89d5c5d8930c01c353938b8a896fc63e9 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Fri, 24 Jun 2022 11:57:58 +0800 Subject: [PATCH] zh --- .../zh/project0512/controller/UtilsController.java | 9 ++++++--- .../controller/manage/AdminController.java | 8 ++++---- .../controller/manage/ReferenceController.java | 4 +++- .../controller/manage/TeachingRefeController.java | 4 +++- .../controller/manage/TopicActivityController.java | 4 +++- .../java/com/zh/project0512/mapper/RankMapper.java | 12 ++++++++++++ .../java/com/zh/project0512/model/Reference.java | 7 +++++++ .../java/com/zh/project0512/model/TaskTeachRefe.java | 8 ++++++++ .../java/com/zh/project0512/model/TeachingRefe.java | 7 +++++++ .../java/com/zh/project0512/model/TopicActivity.java | 7 +++++++ src/main/resources/mapper/ReferenceMapper.xml | 2 +- 11 files changed, 61 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zh/project0512/controller/UtilsController.java b/src/main/java/com/zh/project0512/controller/UtilsController.java index d52269f..ac97f15 100644 --- a/src/main/java/com/zh/project0512/controller/UtilsController.java +++ b/src/main/java/com/zh/project0512/controller/UtilsController.java @@ -89,11 +89,14 @@ public class UtilsController { try { file.transferTo(dest); JSONObject res = new JSONObject(); + int fileTypeNum = FileTypeUtil.getcontentTypeNum((fileName.substring(fileName.lastIndexOf(".")))); res.put("fileName", fileName); - res.put("fileUrl", "/upload/" + newFileName); res.put("duration",new MultimediaObject(dest).getInfo().getDuration()); res.put("fileType", FileTypeUtil.getcontentType((fileName.substring(fileName.lastIndexOf("."))))); - res.put("fileTypeNum", FileTypeUtil.getcontentTypeNum((fileName.substring(fileName.lastIndexOf("."))))); + res.put("fileTypeNum",fileTypeNum); + if(fileTypeNum == 1){ + res.put("fileUrl", "/upload/" + newFileName); + } return Result.success(res, "上传完成"); } catch (Exception e) { e.printStackTrace(); @@ -137,7 +140,6 @@ public class UtilsController { res.replace("errno", 0); JSONObject obj = new JSONObject(); obj.put("alt", fileName); - obj.put("duration",new MultimediaObject(dest).getInfo().getDuration()); obj.put("url", cdn + "/upload/" + newFileName); res.put("data", obj); return res; @@ -166,6 +168,7 @@ public class UtilsController { queryWrapper.groupBy("u.id"); queryWrapper.orderByDesc("value"); List rankUserList = qywxDepartmentUserLinkMapper.getUserRankList(queryWrapper); +// rankMapper.addGroup(rankUserList); return Result.success(rankUserList); } diff --git a/src/main/java/com/zh/project0512/controller/manage/AdminController.java b/src/main/java/com/zh/project0512/controller/manage/AdminController.java index 9040dfe..d340517 100644 --- a/src/main/java/com/zh/project0512/controller/manage/AdminController.java +++ b/src/main/java/com/zh/project0512/controller/manage/AdminController.java @@ -132,10 +132,10 @@ public class AdminController { return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "未找到该用户！"); } up.set(param.getName() != null, "name", param.getName()); - up.set(param.getName() != null, "tel", param.getName()); - up.set(param.getName() != null, "password", param.getName()); - up.set(param.getName() != null, "roleIds", param.getName()); - up.set(param.getName() != null, "realName", param.getName()); + up.set(param.getTel() != null, "tel", param.getTel()); + up.set(param.getPassword() != null, "password", param.getPassword()); + up.set(param.getRoleIds() != null, "roleIds", param.getRoleIds()); + up.set(param.getRealName() != null, "realName", param.getRealName()); up.set("updateAt", LocalDateTime.now()); return Result.success(adminService.update(up)); } 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 643d79d..311c379 100644 --- a/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java +++ b/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java @@ -65,6 +65,8 @@ public class ReferenceController { private List fileUrlList; @Schema(title = "封面图片地址", description = "视频文件请上传封面图片") private String coverUrl; + @Schema(title = "时长", description = "视频文件请上传时长") + private Integer duration; @Schema(title = "标签id列表") private List tagList; @Schema(title = "品牌id列表") @@ -84,7 +86,7 @@ public class ReferenceController { for (String e : list) { if (e.lastIndexOf(".") != -1) { l.add(new Reference().setTitle(param.getTitle()).setGroupId(param.getGroupId()).setCoverUrl(param.getCoverUrl()).setCreatAt(LocalDateTime.now()) - .setFileUrl(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf("."))))); + .setFileUrl(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf(".")))).setDuration(param.getDuration())); // ta.add(new TopicActivity().setTitle(param.getTitle()).setCover(param.getCoverUrl()).setCreatAt(LocalDateTime.now()) // .setContent(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf("."))))); } diff --git a/src/main/java/com/zh/project0512/controller/manage/TeachingRefeController.java b/src/main/java/com/zh/project0512/controller/manage/TeachingRefeController.java index f3d0d26..aa092e5 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TeachingRefeController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TeachingRefeController.java @@ -50,6 +50,8 @@ public class TeachingRefeController { @NotNull(message = "教程文件地址不能为空") @Schema(title = "教程文件地址") private String fileUrl; + @Schema(title = "时长", description = "视频文件请上传时长") + private Integer duration; } @Operation(summary = "创建") @@ -62,7 +64,7 @@ public class TeachingRefeController { return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "文件错误"); } teachingRefeService.addTeachingRefe(new TeachingRefe().setFileUrl(fileUrl).setType(FileTypeUtil.getcontentTypeNum(fileUrl.substring(fileUrl.lastIndexOf(".")))) - .setTitle(param.getTitle()).setCreatAt(LocalDateTime.now())); + .setTitle(param.getTitle()).setCreatAt(LocalDateTime.now()).setDuration(param.getDuration())); 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 f90836e..8fbd340 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TopicActivityController.java @@ -55,6 +55,8 @@ public class TopicActivityController { private Integer type; @NotNull(message = "content不能为空") private String content; + @Schema(title = "时长", description = "视频文件请上传时长") + private Integer duration; @Schema(title = "封面") private String cover; @Schema(title = "是否首页显示",description = "0否；1是") @@ -67,7 +69,7 @@ public class TopicActivityController { @AdminCheckAuthorityAnnotation(jurisdictionId = "4") public Result add(@Validated @RequestBody AddTopicParam param) { TopicActivity topicActivity = new TopicActivity().setTitle(param.getTitle()).setSubtitle(param.getSubtitle()) - .setType(param.getType()).setContent(param.getContent()).setCover(param.getCover()).setCreatAt(LocalDateTime.now()); + .setType(param.getType()).setContent(param.getContent()).setDuration(param.getDuration()).setCover(param.getCover()).setCreatAt(LocalDateTime.now()); if(param.getShowAtIndex() !=null && param.getShowAtIndex() == 1){ topicActivity.setShowAtIndex(1); } diff --git a/src/main/java/com/zh/project0512/mapper/RankMapper.java b/src/main/java/com/zh/project0512/mapper/RankMapper.java index 72f8b8a..ccb542d 100644 --- a/src/main/java/com/zh/project0512/mapper/RankMapper.java +++ b/src/main/java/com/zh/project0512/mapper/RankMapper.java @@ -2,6 +2,18 @@ package com.zh.project0512.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zh.project0512.model.Rank; +import org.apache.ibatis.annotations.Insert; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; public interface RankMapper extends BaseMapper { + @Insert("") + void addGroup(List rankList); } diff --git a/src/main/java/com/zh/project0512/model/Reference.java b/src/main/java/com/zh/project0512/model/Reference.java index 3ed5593..9db7d54 100644 --- a/src/main/java/com/zh/project0512/model/Reference.java +++ b/src/main/java/com/zh/project0512/model/Reference.java @@ -61,6 +61,13 @@ public class Reference extends Model { @TableField("fileUrl") private String fileUrl; + /** + * 时长(视频需要) + */ + @Schema(title = "时长(视频需要)") + @TableField("duration") + private Integer duration; + /** * 封面图片地址 */ diff --git a/src/main/java/com/zh/project0512/model/TaskTeachRefe.java b/src/main/java/com/zh/project0512/model/TaskTeachRefe.java index 2a8086e..280167b 100644 --- a/src/main/java/com/zh/project0512/model/TaskTeachRefe.java +++ b/src/main/java/com/zh/project0512/model/TaskTeachRefe.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -43,6 +44,13 @@ public class TaskTeachRefe extends Model { @TableField("fileUrl") private String fileUrl; + /** + * 时长(视频需要) + */ + @Schema(title = "时长(视频需要)") + @TableField("duration") + private Integer duration; + /** * 类型：1视频；2图片 */ diff --git a/src/main/java/com/zh/project0512/model/TeachingRefe.java b/src/main/java/com/zh/project0512/model/TeachingRefe.java index 55f46f5..324a313 100644 --- a/src/main/java/com/zh/project0512/model/TeachingRefe.java +++ b/src/main/java/com/zh/project0512/model/TeachingRefe.java @@ -36,6 +36,13 @@ public class TeachingRefe extends Model { @TableField("fileUrl") private String fileUrl; + /** + * 时长(视频需要) + */ + @Schema(title = "时长(视频需要)") + @TableField("duration") + private Integer duration; + /** * 类型：1视频；2图片 */ diff --git a/src/main/java/com/zh/project0512/model/TopicActivity.java b/src/main/java/com/zh/project0512/model/TopicActivity.java index c6da78a..6832c5d 100644 --- a/src/main/java/com/zh/project0512/model/TopicActivity.java +++ b/src/main/java/com/zh/project0512/model/TopicActivity.java @@ -49,6 +49,13 @@ public class TopicActivity extends Model { @Schema(title = "内容") private String content; + /** + * 时长(视频需要) + */ + @Schema(title = "时长(视频需要)") + @TableField("duration") + private Integer duration; + /** * 封面 */ diff --git a/src/main/resources/mapper/ReferenceMapper.xml b/src/main/resources/mapper/ReferenceMapper.xml index 8d3d89c..2d2bca8 100644 --- a/src/main/resources/mapper/ReferenceMapper.xml +++ b/src/main/resources/mapper/ReferenceMapper.xml @@ -43,7 +43,7 @@ ${ew.SqlSegment} - ORDER BY dat DESC,updateAt DESC,creatAt DESC + ORDER BY updateAt DESC,creatAt DESC