From 60d86c03aa08c70ab748f272115f67d6643d16e3 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Mon, 12 Dec 2022 00:36:00 +0800
Subject: [PATCH] id

---
 ...acherOpenCourseMergeCourseInfoService.java |  3 ++
 ...penCourseMergeResourcesInfoController.java | 38 +++++++++++++++----
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
index 90535a2f..d2470931 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java
@@ -37,6 +37,7 @@ import org.beetl.sql.core.SqlId;
 import org.beetl.sql.core.engine.PageQuery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
@@ -131,6 +132,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
      * @param key
      */
     @SneakyThrows
+    @Async
      public void invalidateCourseInfoTreeLocalCache(Long key) {
         if(ObjectUtil.isEmpty(key)) { return; }
         treeLocalCache.refresh(key);
@@ -139,6 +141,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService<Tea
      * 清理刷新缓存
      */
     @SneakyThrows
+    @Async
      public void invalidateAllCleanUpCourseInfoTreeLocalCache() {
         treeLocalCache.invalidateAll();
     }
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesInfoController.java
index 2ec4913f..f1bf5a16 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesInfoController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeResourcesInfoController.java
@@ -1,6 +1,7 @@
 package com.ibeetl.jlw.web;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.jlw.Interceptor.GetFile;
 import cn.jlw.Interceptor.RFile;
 import cn.jlw.Interceptor.SCoreUser;
@@ -35,6 +36,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.File;
 import java.io.FileInputStream;
@@ -144,23 +146,45 @@ public class TeacherOpenCourseMergeResourcesInfoController{
     /**
      * 更改资源状态，上架下架啥删除.
      * 删除也可以单独调用 {@link #deleteDo}
-     * @param resourcesInfoId
+     * @param ids
      * @param status
      * @param coreUser
      * @return
      */
     @PostMapping(API + "/updateStatus.do")
     @ResponseBody
-    public JsonResult updateStatus(@NotNull(message = "资源ID不能为空！") Long resourcesInfoId,
+    public JsonResult updateStatus(@NotBlank(message = "资源IDs不能为空！") String ids,
                                    @NotNull(message = "要更新的状态不能为空！") GlobalUpStatusEnum status, @SCoreUser CoreUser coreUser) {
-        teacherOpenCourseMergeResourcesInfoService.validateIsTeacher(resourcesInfoId.toString(), coreUser);
-        TeacherOpenCourseMergeResourcesInfoQuery updateQuery = new TeacherOpenCourseMergeResourcesInfoQuery();
-        updateQuery.setResourcesInfoStatus(status);
-        updateQuery.setTeacherOpenCourseMergeResourcesInfoId(resourcesInfoId);
-        teacherOpenCourseMergeResourcesInfoService.edit(updateQuery);
+        teacherOpenCourseMergeResourcesInfoService.validateIsTeacher(ids, coreUser);
+        for (String id : ids.split(",")) {
+            TeacherOpenCourseMergeResourcesInfoQuery updateQuery = new TeacherOpenCourseMergeResourcesInfoQuery();
+            updateQuery.setResourcesInfoStatus(status);
+            updateQuery.setTeacherOpenCourseMergeResourcesInfoId(Long.valueOf(id));
+            teacherOpenCourseMergeResourcesInfoService.edit(updateQuery);
+        }
         return JsonResult.success();
     }
 
+    @PostMapping(API + "/batchAdd.do")
+    public JsonResult batchAdd(TeacherOpenCourseMergeResourcesInfoQuery teacherOpenCourseMergeResourcesInfoQuery, @SCoreUser CoreUser coreUser){
+        if(null == coreUser){
+            return JsonResult.failMessage("请登录后再操作");
+        }else{
+            teacherOpenCourseMergeResourcesInfoQuery.setUserId(coreUser.getId());
+            teacherOpenCourseMergeResourcesInfoQuery.setOrgId(coreUser.getOrgId());
+            String resourcesInfoFiles = teacherOpenCourseMergeResourcesInfoQuery.getResourcesInfoFiles();
+            if (StrUtil.isNotBlank(resourcesInfoFiles)) {
+//                resourcesInfoFiles.split(",").fo
+            }
+            String msg = teacherOpenCourseMergeResourcesInfoService.addAll(teacherOpenCourseMergeResourcesInfoQuery);
+            if (StringUtils.isBlank(msg)) {
+                return JsonResult.success();
+            } else {
+                return JsonResult.failMessage("新增失败,"+msg);
+            }
+        }
+    }
+
 
 
     /* 后台页面 */