From a070c8d4cdd41eac053a65a3597f5044659ad8a2 Mon Sep 17 00:00:00 2001 From: zhangjinli Date: Wed, 29 Jun 2022 18:57:02 +0800 Subject: [PATCH] zh --- .../controller/ScheduleController.java | 4 +- .../controller/UtilsController.java | 65 +++++++++++++++---- .../controller/manage/TaskController.java | 4 +- .../mapper/QywxDepartmentGroupLinkMapper.java | 8 ++- .../zh/project0512/mapper/VideoMapper.java | 8 +-- .../IQywxDepartmentGroupLinkService.java | 2 +- .../zh/project0512/service/IVideoService.java | 2 +- .../QywxDepartmentGroupLinkServiceImpl.java | 4 +- .../serviceImpl/VideoServiceImpl.java | 4 +- .../mapper/QywxDepartmentGroupLinkMapper.xml | 2 +- 10 files changed, 72 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/zh/project0512/controller/ScheduleController.java b/src/main/java/com/zh/project0512/controller/ScheduleController.java index dc4e2cc..c04a80d 100644 --- a/src/main/java/com/zh/project0512/controller/ScheduleController.java +++ b/src/main/java/com/zh/project0512/controller/ScheduleController.java @@ -64,8 +64,10 @@ public class ScheduleController { @Scheduled(cron = "0 0 0 * * ?") @Transactional public void videoEffect() { +// taskService.getMap() + Integer taskId = 1; // 任务结束7天时，自动结算积分 -// videoService.videoEffectResult(taskId); + videoService.videoEffectResult(taskId); } // @Scheduled(cron = "0 0/1 * * * ? ") // @Scheduled(cron = "0 0 0 1 1/1 ?") diff --git a/src/main/java/com/zh/project0512/controller/UtilsController.java b/src/main/java/com/zh/project0512/controller/UtilsController.java index 03e4517..d80d32d 100644 --- a/src/main/java/com/zh/project0512/controller/UtilsController.java +++ b/src/main/java/com/zh/project0512/controller/UtilsController.java @@ -2,31 +2,31 @@ package com.zh.project0512.controller; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; //import com.zh.project0512.service.IUserService; +import com.zh.project0512.mapper.QywxDepartmentGroupLinkMapper; import com.zh.project0512.mapper.QywxDepartmentUserLinkMapper; import com.zh.project0512.mapper.RankMapper; import com.zh.project0512.model.Rank; -import com.zh.project0512.model.TaskTeachRefe; +import com.zh.project0512.model.Task; import com.zh.project0512.model.dto.RankListDTO; import com.zh.project0512.model.vo.RankListVo; +import com.zh.project0512.service.IQywxDepartmentGroupLinkService; +import com.zh.project0512.service.IRewardRuleService; import com.zh.project0512.service.ITaskService; import com.zh.project0512.service.IVideoService; import com.zh.project0512.utils.AliyunOss; import com.zh.project0512.utils.FileTypeUtil; -import com.zh.project0512.utils.JSONResult; import com.zh.project0512.utils.result.HttpStatusEnum; import com.zh.project0512.utils.result.Result; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.system.ApplicationHome; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.core.ValueOperations; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -34,8 +34,6 @@ import ws.schild.jave.MultimediaObject; import javax.annotation.Resource; import java.io.File; -import java.io.IOException; -import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; @@ -159,7 +157,10 @@ public class UtilsController { RankMapper rankMapper; @Autowired private IVideoService videoService; - + @Autowired + private IRewardRuleService rewardRuleService; + @Autowired + private IQywxDepartmentGroupLinkService qywxDepartmentGroupLinkService; @PostMapping("/test") @ResponseBody public Result test() { @@ -172,11 +173,53 @@ public class UtilsController { ArrayList list = new ArrayList<>(); if (rankUserList != null && rankUserList.size() > 0) { for (RankListVo e : rankUserList) { - new Rank().setTitle(e.getTitle()).setSubtitle(e.getSubtitle()).setLinkId(e.getLinkId()).setValue(e.getValue()).setCreateDate(LocalDateTime.now()); + new Rank().setTitle(e.getTitle()).setSubtitle(e.getSubtitle()).setLinkId(e.getLinkId()).setValue(e.getValue()).setCreateDate(LocalDateTime.now()); // list.add(); } } return Result.success(rankUserList); } + @Data + static class Param { + @Schema(title="接受任务部门列表") + private List departmentList; + } + + @Autowired + private QywxDepartmentGroupLinkMapper qywxDepartmentGroupLinkMapper; + @PostMapping("/test2") + @ResponseBody + public Result test2(@RequestBody Param param) { + List departmentIdList = qywxDepartmentGroupLinkService.departmentIdList(0,param.getDepartmentList()); +// QueryWrapper qw = new QueryWrapper<>(); +// LocalDateTime now = LocalDateTime.now().minusWeeks(1); +// String format = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); +// qw.eq("date_format(end, '%Y-%m-%d')", format); +// List taskList = taskService.list(qw); +// // 处理每个任务的传播值 +// +// // 生成奖励流水并更新给用户积分 +// for (Task t : taskList) { +// Integer taskId = t.getId(); +// List videoEffectResult = videoService.videoEffectResult(taskId); +// List rewardRule = rewardRuleService.listByTemplateId(t.getRewardRuleTemplateId()); +// +// System.out.println("videoEffectResult" + videoEffectResult); +// // 处理任务中每个用户的传播值 +// for (Map m : videoEffectResult) { +// if (m.get("effectResultSum") != null && (Integer) m.get("effectResultSum") != 0) { +// int point = 0; +// int effectResultSum = (Integer) m.get("effectResultSum"); +// // 根据传播值计算规则算出奖励 +// for (Map r : rewardRule) { +// if (effectResultSum > (Integer) r.get("limitNum")) { +// point = (Integer) r.get("reward"); +// } +// } +// } +// } +// } + return Result.success(); + } } 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 8871b83..3638a56 100644 --- a/src/main/java/com/zh/project0512/controller/manage/TaskController.java +++ b/src/main/java/com/zh/project0512/controller/manage/TaskController.java @@ -116,7 +116,7 @@ public class TaskController { } List departmentGroupList = task.getDepartmentGroupList(); if (departmentGroupList != null && departmentGroupList.size() > 0) { - List departmentIdList = qywxDepartmentGroupLinkService.departmentIdList(departmentGroupList); + List departmentIdList = qywxDepartmentGroupLinkService.departmentIdList(null,departmentGroupList); taskDepartmentService.addGroup(departmentIdList, id); } // 上传任务时同时上传素材 @@ -127,7 +127,7 @@ public class TaskController { 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()) + l.add(new Reference().setTitle(task.getTitle()).setCoverUrl(task.getCoverUrl()).setDuration(e.getDuration()).setCreatAt(LocalDateTime.now()).setUpdateAt(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("."))))); diff --git a/src/main/java/com/zh/project0512/mapper/QywxDepartmentGroupLinkMapper.java b/src/main/java/com/zh/project0512/mapper/QywxDepartmentGroupLinkMapper.java index 0c52a54..c397846 100644 --- a/src/main/java/com/zh/project0512/mapper/QywxDepartmentGroupLinkMapper.java +++ b/src/main/java/com/zh/project0512/mapper/QywxDepartmentGroupLinkMapper.java @@ -36,7 +36,8 @@ public interface QywxDepartmentGroupLinkMapper extends BaseMapper departmentList2(Integer groupId); - @Select("SELECT t1.departmentId\n" + + @Select("") + List departmentIdList(Integer xxx, List groupIdList); } diff --git a/src/main/java/com/zh/project0512/mapper/VideoMapper.java b/src/main/java/com/zh/project0512/mapper/VideoMapper.java index 9cdfba4..6b9e465 100644 --- a/src/main/java/com/zh/project0512/mapper/VideoMapper.java +++ b/src/main/java/com/zh/project0512/mapper/VideoMapper.java @@ -59,13 +59,7 @@ public interface VideoMapper extends BaseMapper