1、管理端课程实操接口更换

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java

@@ -3,6 +3,7 @@ package com.ibeetl.jlw.service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.EnumUtil;
 import cn.hutool.core.util.NumberUtil;
@@ -103,6 +104,10 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
     @Autowired
     private TeacherOpenCourseKnowledgePointRelationService teacherOpenCourseKnowledgePointRelationService;
 
+    @Autowired
+    @Lazy
+    private TeacherOpenCourseService teacherOpenCourseService;
+
     // 这里简单使用一个雪花算法，来生成新的ID
     private static final Snowflake snowflake = new Snowflake();
 
@@ -138,6 +143,37 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
         }
     }
 
+    /**
+     * 院校管理删除实训
+     *
+     * @param ids
+     */
+    public void manageDeleteTeacherOpenCourseHandsOn(String ids) {
+        TeacherOpenCourseHandsOn teacherOpenCourseHandsOn = teacherOpenCourseHandsOnDao.getSQLManager()
+                .lambdaQuery(TeacherOpenCourseHandsOn.class)
+                .andEq(TeacherOpenCourseHandsOn::getHandsOnId, ids)
+                .single();
+        if (!ObjectUtil.isEmpty(teacherOpenCourseHandsOn)) {
+
+            TeacherOpenCourse teacherOpenCourse = new TeacherOpenCourse();
+            teacherOpenCourse.setTeacherOpenCourseId(teacherOpenCourseHandsOn.getTeacherOpenCourseId());
+            List<TeacherOpenCourse> teacherOpenCourses = teacherOpenCourseService.getValues(teacherOpenCourse);
+
+            if (CollectionUtil.isNotEmpty(teacherOpenCourses) && teacherOpenCourses.get(0).getEndTime().getTime() >= new Date().getTime()) {
+                Assert.isTrue(false, "课程在使用中");
+            }
+
+            try {
+                teacherOpenCourseHandsOnDao.deleteTeacherOpenCourseHandsOnByIds(ids);
+            } catch (Exception e) {
+                throw new PlatformException("批量删除教师开课-课程实操失败", e);
+            }
+        }else {
+            Assert.isTrue(false, "找不到课程实训");
+        }
+
+    }
+
     public String addAll(TeacherOpenCourseHandsOnQuery teacherOpenCourseHandsOnQuery) {
         String msg = "";
         List<TeacherOpenCourseHandsOn> teacherOpenCourseHandsOnList = new ArrayList<>();
@@ -569,7 +605,6 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
     }
 
 
-
     /**
      * 复制开课实训到开课
      *
@@ -632,8 +667,6 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
         List<TeacherOpenCourseHandsOnSimulationTasks> handsOnSimulationTasksList = teacherOpenCourseHandsOnSimulationTasksService.getValuesByQuery(handsOnSimulationTasksQuery);
 
 
-
-
         Map<Long, Long> simulationTaskOldToNewMap = new HashMap<>();
         for (TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks : handsOnSimulationTasksList) {
             Long newHandsOnId = handsOnIdOldToNewMap.get(teacherOpenCourseHandsOnSimulationTasks.getHandsOnId());
@@ -703,7 +736,6 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
         teacherOpenCourseHandsOnSimulationTasksFileService.insertBatch(handsOnSimulationTasksFileList);
 
 
-
     }
 
     /**
@@ -747,7 +779,6 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
         List<TeacherOpenCourseHandsOn> teacherOpenCourseHandsOnList = new ArrayList<>(BeanUtil.copyToList(handsOnList, TeacherOpenCourseHandsOn.class));
 
 
-
         Map<Long, Long> handsOnIdOldToNewMap = new HashMap<>();
 
         for (TeacherOpenCourseHandsOn teacherOpenCourseHandsOn : teacherOpenCourseHandsOnList) {
@@ -783,7 +814,6 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
         List<TeacherOpenCourseHandsOnSimulationTasks> teacherOpenCourseHandsOnSimulationTasksList = new ArrayList<>(BeanUtil.copyToList(handsOnSimulationTasksList, TeacherOpenCourseHandsOnSimulationTasks.class));
 
 
-
         Map<Long, Long> simulationTaskOldToNewMap = new HashMap<>();
 
         Map<Long, Long> finalResourcesQuestionIdPair = resourcesQuestionIdPair;
@@ -882,12 +912,12 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService<TeacherOpen
         teacherOpenCourseHandsOnSimulationTasksFileService.insertBatch(teacherOpenCourseHandsOnSimulationTasksFileList);
 
 
-
     }
 
     /**
      * 批量修改 状态
      * 1 上架 2下架  0删除
+     *
      * @param ids
      * @param status
      */

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java

@@ -782,6 +782,18 @@ public class TeacherOpenCourseHandsOnController{
         return JsonResult.success();
     }
 
+    /**
+     * 院校管理实操删除
+     * @param ids
+     * @return
+     */
+    @PostMapping(MODEL + "/manageDelete.json")
+    @ResponseBody
+    public JsonResult manageDeleteTeacherOpenCourseHandsOn(String ids) {
+        teacherOpenCourseHandsOnService.manageDeleteTeacherOpenCourseHandsOn(ids);
+        return JsonResult.success();
+    }
+
     /**
      * 实操更新
      * @param teacherOpenCourseHandsOnQuery