zh

src/main/java/com/zh/project0512/controller/UtilsController.java

@@ -44,6 +44,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -188,43 +189,43 @@ public class UtilsController {
 //        System.out.println(a);
 //        int b = StringUtils.countOccurrencesOf(a, "https://v.douyin");
 //        System.out.println(b);
-//
-//            List<String> list1 = new ArrayList<String>();
-//            list1.add("1");
-//            list1.add("2");
-//            list1.add("3");
-//            list1.add("5");
-//            list1.add("6");
-//            List<String> list2 = new ArrayList<String>();
-//            list2.add("2");
-//            list2.add("3");
-//            list2.add("7");
-//            list2.add("8");
-//// 交集
-//            List<String> intersection = list1.stream().filter(item -> list2.contains(item)).collect(toList());
-//            System.out.println("---交集 intersection---");
-//            intersection.parallelStream().forEach(System.out :: println);
-//// 差集 (list1 - list2)
-//            List<String> reduce1 = list1.stream().filter(item -> !list2.contains(item)).collect(toList());
-//            System.out.println("---差集 reduce1 (list1 - list2)---");
-//            reduce1.parallelStream().forEach(System.out :: println);
-//// 差集 (list2 - list1)
-//            List<String> reduce2 = list2.stream().filter(item -> !list1.contains(item)).collect(toList());
-//            System.out.println("---差集 reduce2 (list2 - list1)---");
-//            reduce2.parallelStream().forEach(System.out :: println);
-//// 并集
-//            List<String> listAll = list1.parallelStream().collect(toList());
-//            List<String> listAll2 = list2.parallelStream().collect(toList());
-//            listAll.addAll(listAll2);
-//            System.out.println("---并集 listAll---");
-//            listAll.parallelStream().forEachOrdered(System.out :: println);
-//// 去重并集
-//            List<String> listAllDistinct = listAll.stream().distinct().collect(toList());
-//            System.out.println("---得到去重并集 listAllDistinct---");
-//            listAllDistinct.parallelStream().forEachOrdered(System.out :: println);
-//            System.out.println("---原来的List1---");
-//            list1.parallelStream().forEachOrdered(System.out :: println);
-//            System.out.println("---原来的List2---");
-//            list2.parallelStream().forEachOrdered(System.out :: println);
+
+        List<String> list1 = new ArrayList<String>();
+        list1.add("1");
+        list1.add("2");
+        list1.add("3");
+        list1.add("5");
+        list1.add("6");
+        List<String> list2 = new ArrayList<String>();
+        list2.add("2");
+        list2.add("3");
+        list2.add("7");
+        list2.add("8");
+// 交集
+        List<String> intersection = list1.stream().filter(item -> list2.contains(item)).collect(Collectors.toList());
+        System.out.println("---交集 intersection---");
+        intersection.parallelStream().forEach(System.out::println);
+// 差集 (list1 - list2)
+        List<String> reduce1 = list1.stream().filter(item -> !list2.contains(item)).collect(Collectors.toList());
+        System.out.println("---差集 reduce1 (list1 - list2)---");
+        reduce1.parallelStream().forEach(System.out::println);
+// 差集 (list2 - list1)
+        List<String> reduce2 = list2.stream().filter(item -> !list1.contains(item)).collect(Collectors.toList());
+        System.out.println("---差集 reduce2 (list2 - list1)---");
+        reduce2.parallelStream().forEach(System.out::println);
+// 并集
+        List<String> listAll = list1.parallelStream().collect(Collectors.toList());
+        List<String> listAll2 = list2.parallelStream().collect(Collectors.toList());
+        listAll.addAll(listAll2);
+        System.out.println("---并集 listAll---");
+        listAll.parallelStream().forEachOrdered(System.out::println);
+// 去重并集
+        List<String> listAllDistinct = listAll.stream().distinct().collect(Collectors.toList());
+        System.out.println("---得到去重并集 listAllDistinct---");
+        listAllDistinct.parallelStream().forEachOrdered(System.out::println);
+        System.out.println("---原来的List1---");
+        list1.parallelStream().forEachOrdered(System.out::println);
+        System.out.println("---原来的List2---");
+        list2.parallelStream().forEachOrdered(System.out::println);
     }
 }

src/main/java/com/zh/project0512/controller/manage/TaskController.java

@@ -23,7 +23,6 @@ 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.apache.poi.ss.formula.functions.T;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +38,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -317,17 +317,87 @@ public class TaskController {
     @PostMapping("/upd")
     @AdminTokenValid
     public Result upd(@Validated(TaskValidGroup2.class) @RequestBody Task task) {
-        if (LocalDateTime.now().isAfter(task.getStart())) {
+        if (task.getStart() != null && LocalDateTime.now().isAfter(task.getStart())) {
             task.setStatus(1);
         }
         int id = task.getId();
-        List tagList = task.getTagList();
-//        List<Map> tagList = taskTagService.selByTaskId(id);
+
+        // 添加任务标签
+        List tagIdList = task.getTagList();
+        if(tagIdList !=null){
+            if(tagIdList.size()== 0){
+                taskTagService.remove(new QueryWrapper<TaskTag>().eq("taskId", id));
+            }else{
+                List<Map> tagListOri = taskTagService.selByTaskId(id);
+                taskTagService.remove(new QueryWrapper<TaskTag>().eq("taskId", id).notIn((tagIdList!=null&&tagIdList.size()!=0),"tagId", tagIdList));
+                List tagIdListOri = new ArrayList();
+                for (Map map : tagListOri) {
+                    tagIdListOri.add(map.get("id"));
+                }
+                List collect = (List) tagIdList.stream().filter(item -> !tagIdListOri.contains(item)).collect(Collectors.toList());
+                if (collect != null && collect.size() != 0) {
+                    taskTagService.addGroup(collect, id);
+                }
+            }
+        }
+
+        // 添加任务品牌
+        List brandIdList = task.getBrandList();
+        if(brandIdList !=null){
+            if(brandIdList.size()== 0){
+                taskBrandService.remove(new QueryWrapper<TaskBrand>().eq("taskId", id));
+            }else{
+                List<Map> brandListOri = taskBrandService.selByTaskId(id);
+                taskBrandService.remove(new QueryWrapper<TaskBrand>().eq("taskId", id).notIn((brandIdList!=null&&brandIdList.size()!=0),"brandId", brandIdList));
+                List brandIdListOri = new ArrayList();
+                for (Map map : brandListOri) {
+                    brandIdListOri.add(map.get("id"));
+                }
+                List collect = (List) brandIdList.stream().filter(item -> !brandIdListOri.contains(item)).collect(Collectors.toList());
+                if (collect != null && collect.size() != 0) {
+                    taskBrandService.addGroup(collect, id);
+                }
+            }
+        }
+        List dpIdList = new ArrayList();
+        List<Integer> departmentIdList = task.getDepartmentList();
+        if (departmentIdList != null && departmentIdList.size() > 0) {
+            for (Integer e : departmentIdList) {
+                dpIdList.add(e);
+            }
+        }
+        List departmentGroupList = task.getDepartmentGroupList();
+        if (departmentGroupList != null && departmentGroupList.size() > 0) {
+            List<Integer> departmentIdList1 = qywxDepartmentGroupLinkService.departmentIdList(null, departmentGroupList);
+            if (departmentIdList != null && departmentIdList.size() > 0) {
+                for (Integer e : departmentIdList1) {
+                    dpIdList.add(e);
+                }
+            }
+        }
+        if(dpIdList !=null){
+            if(dpIdList.size()== 0){
+                taskDepartmentService.remove(new QueryWrapper<TaskDepartment>().eq("taskId", id));
+            }else{
+                List<TaskDepartment> departmentListOri = taskDepartmentService.list(new QueryWrapper<TaskDepartment>().eq("taskId",task.getId()));
+                taskDepartmentService.remove(new QueryWrapper<TaskDepartment>().eq("taskId", id).notIn((dpIdList!=null&&dpIdList.size()!=0),"brandId", departmentIdList));
+                List departmentIdListOri = new ArrayList();
+                for (TaskDepartment taskDepartment : departmentListOri) {
+                    departmentIdListOri.add(taskDepartment.getDepartmentId());
+                }
+                List collect = (List) dpIdList.stream().filter(item -> !departmentIdListOri.contains(item)).collect(Collectors.toList());
+                if (collect != null && collect.size() != 0) {
+                    taskDepartmentService.addGroup(collect, id);
+                }
+            }
+        }
+
+        return Result.success();
 //        if (tagList != null && tagList.size() > 0) {
 //            taskTagService.addGroup(tagList, id);
 //        }
-        task.setUpdateAt(LocalDateTime.now());
-        return MybatisPlusUtil.sqlResult(taskService.updateById(task), "修改");
+//        task.setUpdateAt(LocalDateTime.now());
+//        return MybatisPlusUtil.sqlResult(taskService.updateById(task), "修改");
     }
 
 //    @Operation(summary = "删除")

src/main/java/com/zh/project0512/model/Task.java

@@ -94,6 +94,7 @@ public class Task extends Model {
     /**
      * 奖励模版id
      */
+    @NotNull(message = "请输入奖励模版id",groups = {TaskValidGroup1.class})
     @Schema(title="奖励模版id")
     @TableField("rewardRuleTemplateId")
     private Integer rewardRuleTemplateId;

src/main/java/com/zh/project0512/service/ITaskService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zh.project0512.model.Reference;
 import com.zh.project0512.model.Task;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zh.project0512.model.vo.FileUploadParamVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.poi.ss.formula.functions.T;
 
@@ -28,4 +29,9 @@ public interface ITaskService extends IService<Task> {
     JSONObject taskEffect(@Param("ew") Wrapper<Task> queryWrapper);
     List<Map> taskEffectData(@Param("ew") Wrapper<Task> queryWrapper);
     List<Map> taskDepartment(int taskId);
+
+    // 上传任务时同时上传素材
+    Boolean upReferenceInTask(Task task,  List<Integer> referenceList, List<FileUploadParamVo> referenceUrlList) ;
+    // 上传任务的通用教程
+    Boolean upTeachRefeInTask(Task task,List<Integer> teachRefeList, List<FileUploadParamVo> teachRefeUrlList);
 }

src/main/java/com/zh/project0512/serviceImpl/TaskServiceImpl.java

@@ -3,16 +3,23 @@ package com.zh.project0512.serviceImpl;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zh.project0512.mapper.ReferenceMapper;
 import com.zh.project0512.model.Reference;
 import com.zh.project0512.model.Task;
 import com.zh.project0512.mapper.TaskMapper;
-import com.zh.project0512.service.ITaskService;
+import com.zh.project0512.model.TaskTeachRefe;
+import com.zh.project0512.model.TeachingRefe;
+import com.zh.project0512.model.vo.FileUploadParamVo;
+import com.zh.project0512.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zh.project0512.utils.FileTypeUtil;
 import org.apache.ibatis.annotations.Param;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -28,26 +35,99 @@ import java.util.Map;
 public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements ITaskService {
     @Autowired
     private TaskMapper taskMapper;
+    @Autowired
+    private IReferenceService referenceService;
+    @Autowired
+    private ITaskReferenceService taskReferenceService;
+    @Autowired
+    private ITeachingRefeService teachingRefeService;
+    @Autowired
+    private ITaskTeachRefeService taskTeachRefeService;
 
     public void add(Task task) {
         taskMapper.add(task);
     }
+
     public IPage<Integer> idList(IPage iPage, String openid, List<Integer> tagIdList, List<Integer> brandIdList, @Param("ew") Wrapper<Reference> queryWrapper) {
         return taskMapper.idList(iPage, openid, tagIdList, brandIdList, queryWrapper);
     }
+
     public List<Map> list(String openid, List<Integer> list, List<Integer> tagIdList, List<Integer> brandIdList, @Param("ew") Wrapper<Reference> queryWrapper) {
         return taskMapper.list(openid, list, tagIdList, brandIdList, queryWrapper);
     }
+
     public Task detailById(String openid, int id) {
         return taskMapper.detailById(openid, id);
     }
+
     public JSONObject taskEffect(@Param("ew") Wrapper<Task> queryWrapper) {
         return taskMapper.taskEffect(queryWrapper);
     }
+
     public List<Map> taskEffectData(@Param("ew") Wrapper<Task> queryWrapper) {
         return taskMapper.taskEffectData(queryWrapper);
     }
+
     public List<Map> taskDepartment(int taskId) {
         return taskMapper.taskDepartment(taskId);
     }
+
+    // 上传任务时同时上传素材
+    public Boolean upReferenceInTask(Task task,  List<Integer> referenceList, List<FileUploadParamVo> referenceUrlList) {
+        List<Integer> reference = new ArrayList<>();
+        if (referenceList != null && referenceList.size() > 0) {
+            for (Integer e : referenceList) {
+                reference.add(e);
+            }
+        }
+        // 上传任务时同时上传素材
+        if (referenceUrlList != null && referenceUrlList.size() > 0) {
+            List<Reference> l = new ArrayList<>();
+//            List<TopicActivity> ta = new ArrayList<>();
+            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()).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(".")))));
+                }
+            }
+            if (l.size() > 0) {
+                referenceService.saveBatch(l);
+//                topicActivityService.saveBatch(ta);
+                for (Reference r : l) {
+                    referenceList.add(r.getId());
+                }
+            }
+        }
+        if (reference.size() > 0) {
+            taskReferenceService.addGroup(reference, task.getId());
+        }
+        return true;
+    }
+
+    // 上传任务的通用教程
+    public Boolean upTeachRefeInTask(Task task,List<Integer> teachRefeList, List<FileUploadParamVo> teachRefeUrlList) {
+        List<TaskTeachRefe> l2 = new ArrayList<>();
+        if (teachRefeList != null && teachRefeList.size() > 0) {
+            List<TeachingRefe> teachingRefes = (List<TeachingRefe>) teachingRefeService.listByIds(teachRefeList);
+            for (TeachingRefe e : teachingRefes) {
+                l2.add((new TaskTeachRefe().setTaskId(task.getId()).setCreatAt(LocalDateTime.now())
+                    .setFileUrl(e.getFileUrl()).setType(FileTypeUtil.getcontentTypeNum(e.getFileUrl().substring(e.getFileUrl().lastIndexOf("."))))));
+            }
+        }
+        for (
+            FileUploadParamVo e : teachRefeUrlList) {
+            String url = e.getUrl();
+            if (url != null && url.lastIndexOf(".") != -1) {
+                l2.add(new TaskTeachRefe().setTaskId(task.getId()).setCreatAt(LocalDateTime.now()).setDuration(e.getDuration())
+                    .setFileUrl(url).setType(FileTypeUtil.getcontentTypeNum(url.substring(url.lastIndexOf(".")))));
+            }
+        }
+        if (l2.size() > 0) {
+            taskTeachRefeService.saveBatch(l2);
+        }
+        return true;
+    }
 }