From 2d2068ba1b5d9ed1c82282aad395833f004351a6 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Fri, 24 Jun 2022 15:00:30 +0800 Subject: [PATCH] zh --- .../manage/ReferenceController.java | 27 +++++--- .../controller/manage/TaskController.java | 63 ++++++++++--------- .../java/com/zh/project0512/model/Task.java | 11 +++- .../model/vo/FileUploadParamVo.java | 25 ++++++++ 4 files changed, 85 insertions(+), 41 deletions(-) create mode 100644 src/main/java/com/zh/project0512/model/vo/FileUploadParamVo.java 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 311c379..66951ab 100644 --- a/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java +++ b/src/main/java/com/zh/project0512/controller/manage/ReferenceController.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zh.project0512.annotation.AdminCheckAuthorityAnnotation; import com.zh.project0512.annotation.AdminTokenValid; import com.zh.project0512.model.*; +import com.zh.project0512.model.vo.FileUploadParamVo; import com.zh.project0512.service.IReferenceBrandService; import com.zh.project0512.service.IReferenceService; import com.zh.project0512.service.IReferenceTagService; @@ -62,7 +63,7 @@ public class ReferenceController { private Integer groupId; @Schema(title = "文件地址列表") @NotEmpty(message = "fileUrl列表不能为空") - private List fileUrlList; + private List fileUrlList; @Schema(title = "封面图片地址", description = "视频文件请上传封面图片") private String coverUrl; @Schema(title = "时长", description = "视频文件请上传时长") @@ -73,20 +74,28 @@ public class ReferenceController { private List brandList; } - @Operation(summary = "添加素材",description = "可根据文件不同同时上传多个素材") + @Operation(summary = "添加素材", description = "可根据文件不同同时上传多个素材") @PostMapping("/add") @AdminTokenValid @AdminCheckAuthorityAnnotation(jurisdictionId = "7") public Result add(@Validated @RequestBody AddRParam param) { - List list = param.getFileUrlList(); + List list = param.getFileUrlList(); List l = new ArrayList<>(); // List ta = new ArrayList<>(); List tagList = param.getTagList(); List brandList = param.getBrandList(); - 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(".")))).setDuration(param.getDuration())); + for (FileUploadParamVo e : list) { + String url = e.getUrl(); + if (url != null && url.lastIndexOf(".") != -1) { + l.add(new Reference() + .setTitle(param.getTitle()) + .setGroupId(param.getGroupId()) + .setCoverUrl(param.getCoverUrl()) + .setCreatAt(LocalDateTime.now()) + .setDuration(e.getDuration()) + .setFileUrl(url) + .setType(FileTypeUtil.getcontentTypeNum(url.substring(url.lastIndexOf(".")))) + ); // ta.add(new TopicActivity().setTitle(param.getTitle()).setCover(param.getCoverUrl()).setCreatAt(LocalDateTime.now()) // .setContent(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf("."))))); } @@ -96,7 +105,7 @@ public class ReferenceController { } referenceService.saveBatch(l); // topicActivityService.saveBatch(ta); - if (tagList !=null && tagList.size() > 0) { + if (tagList != null && tagList.size() > 0) { List tag = new ArrayList<>(); for (Reference r : l) { for (Integer t : tagList) { @@ -106,7 +115,7 @@ public class ReferenceController { referenceTagService.addGroup(tag); } List brand = new ArrayList<>(); - if (brandList !=null && brandList.size() > 0) { + if (brandList != null && brandList.size() > 0) { for (Reference r : l) { for (Integer t : brandList) { brand.add(new JSONObject().fluentPut("referenceId", r.getId()).fluentPut("brandId", t)); diff --git a/src/main/java/com/zh/project0512/controller/manage/TaskController.java b/src/main/java/com/zh/project0512/controller/manage/TaskController.java index 8b260f3..302d6d1 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java @@ -11,6 +11,7 @@ import com.zh.project0512.annotation.AdminTokenValid; import com.zh.project0512.model.*; import com.zh.project0512.model.validatedDemo.TaskValidGroup1; import com.zh.project0512.model.validatedDemo.TaskValidGroup2; +import com.zh.project0512.model.vo.FileUploadParamVo; import com.zh.project0512.service.*; import com.zh.project0512.utils.CustomUtil; import com.zh.project0512.utils.FileTypeUtil; @@ -102,14 +103,15 @@ public class TaskController { taskDepartmentService.addGroup(departmentList, id); } // 上传任务时同时上传素材 - List referenceUrlList = task.getReferenceUrlList(); + List referenceUrlList = task.getReferenceUrlList(); if (referenceUrlList != null && referenceUrlList.size() > 0) { List l = new ArrayList<>(); // List ta = new ArrayList<>(); - for (String e : referenceUrlList) { - if (e.lastIndexOf(".") != -1) { - l.add(new Reference().setTitle(task.getTitle()).setCoverUrl(task.getCoverUrl()).setCreatAt(LocalDateTime.now()) - .setFileUrl(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf("."))))); + for (FileUploadParamVo e : referenceUrlList) { + String url = e.getUrl(); + if (url != null && e.getUrl().lastIndexOf(".") != -1) { + l.add(new Reference().setTitle(task.getTitle()).setCoverUrl(task.getCoverUrl()).setDuration(e.getDuration()).setCreatAt(LocalDateTime.now()) + .setFileUrl(url).setType(FileTypeUtil.getcontentTypeNum(url.substring(url.lastIndexOf("."))))); // ta.add(new TopicActivity().setTitle(task.getTitle()).setCover(task.getCoverUrl()).setCreatAt(LocalDateTime.now()) // .setContent(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf("."))))); } @@ -127,18 +129,19 @@ public class TaskController { // 上传任务的通用教程 List l2 = new ArrayList<>(); List teachRefeList = task.getTeachRefeList(); - if(teachRefeList!=null && teachRefeList.size()>0){ + if (teachRefeList != null && teachRefeList.size() > 0) { List teachingRefes = (List) teachingRefeService.listByIds(teachRefeList); for (TeachingRefe e : teachingRefes) { l2.add((new TaskTeachRefe().setTaskId(id).setCreatAt(LocalDateTime.now()) .setFileUrl(e.getFileUrl()).setType(FileTypeUtil.getcontentTypeNum(e.getFileUrl().substring(e.getFileUrl().lastIndexOf(".")))))); } } - List teachRefeUrlList = task.getTeachRefeUrlList(); - for (String e : teachRefeUrlList) { - if (e.lastIndexOf(".") != -1) { - l2.add(new TaskTeachRefe().setTaskId(id).setCreatAt(LocalDateTime.now()) - .setFileUrl(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf("."))))); + List teachRefeUrlList = task.getTeachRefeUrlList(); + for (FileUploadParamVo e : teachRefeUrlList) { + String url = e.getUrl(); + if (url != null && url.lastIndexOf(".") != -1) { + l2.add(new TaskTeachRefe().setTaskId(id).setCreatAt(LocalDateTime.now()).setDuration(e.getDuration()) + .setFileUrl(url).setType(FileTypeUtil.getcontentTypeNum(url.substring(url.lastIndexOf("."))))); } } if (l2.size() > 0) { @@ -310,11 +313,11 @@ public class TaskController { @AdminCheckAuthorityAnnotation(jurisdictionId = "3") public Result del(@Validated @RequestBody DetTaskParam param) { UpdateWrapper ew = new UpdateWrapper<>(); - ew.eq("status",1).eq("id",param.getId()) - .set("status",2).set("updateAt",LocalDateTime.now()); + ew.eq("status", 1).eq("id", param.getId()) + .set("status", 2).set("updateAt", LocalDateTime.now()); taskService.update(ew); - videoService.updStatusByTaskId(param.getId(),LocalDateTime.now()); - return Result.success("","终止任务完成"); + videoService.updStatusByTaskId(param.getId(), LocalDateTime.now()); + return Result.success("", "终止任务完成"); } @Data @@ -347,7 +350,7 @@ public class TaskController { if (null != param.getKeyword()) { qw.like("t1.title", param.getKeyword()); } - IPage iPage = taskService.idList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()),null, param.getTagIdList(), param.getBrandIdList(), qw); + IPage iPage = taskService.idList(MybatisPlusUtil.SetNumPage(param.getPageNum(), param.getPageSize()), null, param.getTagIdList(), param.getBrandIdList(), qw); List list = iPage.getRecords(); if (list.size() > 0) { iPage.setRecords(taskService.list(null, list, param.getTagIdList(), param.getBrandIdList(), qw)); @@ -369,11 +372,11 @@ public class TaskController { public Result det(@Validated @RequestBody DetTaskParam param) { Task task = taskService.detailById(null, param.getId()); JSONObject res = (JSONObject) JSONObject.toJSON(task); - if(task!=null) { + if (task != null) { List rewardRulesList = rewardRuleService.listByTemplateId(task.getRewardRuleTemplateId()); res.put("rewardRuleList", rewardRulesList); List departmentList = taskService.taskDepartment(task.getId()); - res.put("departmentList",departmentList); + res.put("departmentList", departmentList); } return Result.success(res); } @@ -382,12 +385,12 @@ public class TaskController { @PostMapping("taskEffect") @AdminTokenValid public Result taskEffect(@Validated @RequestBody DetTaskParam param) { - List maps = taskService.taskEffectData(new QueryWrapper().eq("t2.id",param.getId())); + List maps = taskService.taskEffectData(new QueryWrapper().eq("t2.id", param.getId())); JSONObject obj = new JSONObject(); - obj.put("taskEffect",maps.get(0)); - if(maps!=null) { + obj.put("taskEffect", maps.get(0)); + if (maps != null) { QueryWrapper qw = new QueryWrapper<>(); - qw.eq("t2.id",param.getId()).groupBy("t1.userId"); + qw.eq("t2.id", param.getId()).groupBy("t1.userId"); obj.put("userEffectList", taskService.taskEffectData(qw)); } return Result.success(obj); @@ -409,11 +412,11 @@ public class TaskController { @AdminTokenValid public Result taskUserEffect(@Validated @RequestBody TaskUserParam param) { QueryWrapper qw = new QueryWrapper<>(); - qw.eq("t2.id",param.getId()).eq("t1.userId",param.getUserId()).groupBy("t1.userId"); + qw.eq("t2.id", param.getId()).eq("t1.userId", param.getUserId()).groupBy("t1.userId"); JSONObject taskEffect = taskService.taskEffect(qw); - if(taskEffect!=null) { + if (taskEffect != null) { QueryWrapper