From 887ce388b70da3e2e3488ae8c773991834fe754c Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Tue, 12 Jul 2022 13:53:28 +0800 Subject: [PATCH] zh --- .../controller/UtilsController.java | 3 +- .../controller/manage/TaskController.java | 64 ++++++++++++++----- .../controller/manage/VideoController.java | 6 +- .../com/zh/project0512/mapper/TaskMapper.java | 9 +++ .../zh/project0512/mapper/VideoMapper.java | 5 +- .../zh/project0512/service/ITaskService.java | 2 + .../serviceImpl/TaskServiceImpl.java | 7 +- 7 files changed, 75 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/zh/project0512/controller/UtilsController.java b/src/main/java/com/zh/project0512/controller/UtilsController.java index 6cc4025..febd2de 100644 --- a/src/main/java/com/zh/project0512/controller/UtilsController.java +++ b/src/main/java/com/zh/project0512/controller/UtilsController.java @@ -94,7 +94,8 @@ public class UtilsController { try { String filePath = path + "/" + newFileName; File dest = new File(filePath); - if (compress != null && compress &&fileTypeNum ==2&& file.getSize() >= picSizeLimit) { +// if (compress != null && compress &&fileTypeNum ==2&& file.getSize() >= picSizeLimit) { + if (file.getSize() >= picSizeLimit) { String filePathSmall = path + "/" + newFileNameSmall; File beforeFile = new File(filePathSmall); //生成目标图片 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 6381dc4..e162572 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java @@ -407,8 +407,8 @@ public class TaskController { @AdminCheckAuthorityAnnotation(jurisdictionId = "135") public Result dele(@Validated @RequestBody DelTaskParam param) { Task task = taskService.getById(param.getId()); - if (task.getStatus() !=0){ - return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION,"只支持未上线的任务删除"); + if (task.getStatus() != 0) { + return Result.fail(HttpStatusEnum.CUSTOM_EXCEPTION, "只支持未上线的任务删除"); } return MybatisPlusUtil.sqlResult(taskService.removeById(param.getId()), "删除"); } @@ -421,7 +421,7 @@ public class TaskController { public Result del(@Validated @RequestBody DetTaskParam param) { UpdateWrapper ew = new UpdateWrapper<>(); ew.eq("status", 1).eq("id", param.getId()) - .set("status", 2).set("end",LocalDateTime.now()).set("updateAt", LocalDateTime.now()); + .set("status", 2).set("end", LocalDateTime.now()).set("updateAt", LocalDateTime.now()); taskService.update(ew); videoService.updStatusByTaskId(param.getId(), LocalDateTime.now()); return Result.success("", "终止任务完成"); @@ -433,16 +433,17 @@ public class TaskController { private IUserPointsRecordsService userPointsRecordsService; @Autowired private HttpUtil httpUtil; + @PostMapping("/finish") @ResponseBody - public Result test(@Validated @RequestBody DelTaskParam param) { + public Result finish(@Validated @RequestBody DelTaskParam param) { // 任务结束7天时，自动结算积分 QueryWrapper qw = new QueryWrapper<>(); LocalDateTime now = LocalDateTime.now(); LocalDateTime weekAgo = now.minusWeeks(0); AppMessage appMessage = new AppMessage().setTitle("任务积分结算"); String format = weekAgo.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); - qw.eq("status",2).eq("id", param.getId()); + qw.eq("status", 2).eq("id", param.getId()); List taskList = taskService.list(qw); String qywxAccessToken = httpUtil.qywxGetToken(); // 处理每个任务的传播值 @@ -479,12 +480,12 @@ public class TaskController { httpUtil.qywxMessage(qywxAccessToken, touser, "任务积分结算", null, appMessage.getUrl(), content_item); } AppMessageUtil.sendMessage(appMessage); - recordsList.add(new UserPointsRecords().setSettlementMethod(1).setPoints(point).setType(1).setRemarks("任务完成结算："+t.getTitle()).setCreateDate(now).setUserId(userId)); + recordsList.add(new UserPointsRecords().setSettlementMethod(1).setPoints(point).setType(1).setRemarks("任务完成结算：" + t.getTitle()).setCreateDate(now).setUserId(userId)); } } // 按任务生成积分流水记录 userPointsRecordsService.saveBatch(recordsList); - taskService.update(new UpdateWrapper().eq("id",taskId).set("status",3)); + taskService.update(new UpdateWrapper().eq("id", taskId).set("status", 3)); } return Result.success(); } @@ -559,19 +560,50 @@ public class TaskController { return Result.success(res); } + @Data + static class TaskDataParam { + @NotNull(message = "id不能为空") + @Min(value = 1, message = "id最小值为1") + @Schema(title = "任务id") + private Integer id; + @Schema(title = "用户名称") + private String userName; + @Schema(title = "部门名称") + private String departmentName; + } + + @Operation(summary = "任务传播数据") @PostMapping("taskEffect") @AdminTokenValid - public Result taskEffect(@Validated @RequestBody DetTaskParam param) { - List maps = taskService.taskEffectData(new QueryWrapper().eq("t2.id", param.getId())); - JSONObject obj = new JSONObject(); - obj.put("taskEffect", maps.get(0)); - if (maps != null) { - QueryWrapper qw = new QueryWrapper<>(); - qw.eq("t2.id", param.getId()).groupBy("t1.userId"); - obj.put("userEffectList", taskService.taskEffectData(qw)); + public Result taskEffect(@Validated @RequestBody DetTaskParam param) { + Integer taskId = param.getId(); + List maps = taskService.taskEffectData(new QueryWrapper().eq("t2.id", taskId)); + Map map = maps.get(0); + if (map != null) { + map.remove("userId"); + map.remove("userName"); + Integer taskUserSum = 0; + if (taskDepartmentService.count(new QueryWrapper().eq("taskId", taskId)) == 0) { + taskUserSum = userService.count(); + }else{ + taskUserSum = taskService.taskUserSum(taskId); + } + map.put("taskUserSum",taskUserSum); + map.put("taskUserNum",taskService.taskUserNum(taskId)); } - return Result.success(obj); + return Result.success(map); + } + + @Operation(summary = "任务传播数据") + @PostMapping("taskEffectData") + @AdminTokenValid + public Result taskEffectData(@Validated @RequestBody TaskDataParam param) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("t2.id", param.getId()).groupBy("t1.userId"); + qw.like(param.getUserName() != null, "t3.name", param.getUserName()); + qw.like(param.getDepartmentName() != null, "t4.name", param.getDepartmentName()); + return Result.success( taskService.taskEffectData(qw)); } @Data diff --git a/src/main/java/com/zh/project0512/controller/manage/VideoController.java b/src/main/java/com/zh/project0512/controller/manage/VideoController.java index 4a4f243..9690b14 100644 --- a/src/main/java/com/zh/project0512/controller/manage/VideoController.java +++ b/src/main/java/com/zh/project0512/controller/manage/VideoController.java @@ -75,6 +75,10 @@ public class VideoController { @Min(value = 1, message = "视频状态范围：1待审核；2审核通过；3审核拒绝") @Max(value = 3, message = "视频状态范围：1待审核；2审核通过；3审核拒绝") private Integer status; +// @Schema(title = "平台", description = "1抖音；2快手；3朋友圈；4视频号") +// @Min(value = 1, message = "视频平台：1抖音；2快手；3朋友圈；4视频号") +// @Max(value = 4, message = "视频平台：1抖音；2快手；3朋友圈；4视频号") +// private Integer type; @Schema(title = "申请人名称") private String providerName; @Schema(title = "部门id") @@ -95,7 +99,7 @@ public class VideoController { public Result list(@Validated @RequestBody VParam param) { QueryWrapper