diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeCourseInfoDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeCourseInfoDao.java
index 3f111987..f6524e8c 100644
--- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeCourseInfoDao.java
+++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherOpenCourseMergeCourseInfoDao.java
@@ -62,4 +62,14 @@ public interface TeacherOpenCourseMergeCourseInfoDao extends BaseMapper
* 这里会使用Spring自带的方法,来查找哪些实现类,自动调用实现类方法。前提是已经注册成Bean
*
*
* 详细查看实现方法。
- * {@link TeacherOpenCourseMergeCourseInfoService#deleteByTeacherOpenCourseId}
+ * {@link TeacherOpenCourseMergeCourseInfoService#resetOperationByTeacherOpenCourseId}
* @param teacherOpenCourseId
*/
- void deleteByTeacherOpenCourseId(@NotNull(message = "开课ID不能为空!") final Long teacherOpenCourseId);
+ void resetOperationByTeacherOpenCourseId(@NotNull(message = "开课ID不能为空!") final Long teacherOpenCourseId);
+
+ /**
+ * 这是真清空操作。删除所有有关课程相关的东西
+ * 相当于教师如果关闭开课的话,那么所有的所有,都要删除,不然会有僵尸数据,越来越多。
+ */
+ void deleteTeacherOpenCourseAllRelatedByTeacherOpenCourseId(@NotNull(message = "开课ID不能为空!") final Long teacherOpenCourseId);
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherMergeApplicationService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherMergeApplicationService.java
index 5298b480..31a1c11d 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherMergeApplicationService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherMergeApplicationService.java
@@ -12,6 +12,7 @@ import com.ibeetl.jlw.dao.TeacherMergeApplicationDao;
import com.ibeetl.jlw.entity.TeacherMergeApplication;
import com.ibeetl.jlw.enums.MoveEnum;
import com.ibeetl.jlw.web.query.TeacherMergeApplicationQuery;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.SqlId;
import org.beetl.sql.core.engine.PageQuery;
@@ -34,7 +35,8 @@ import java.util.List;
@Service
@Transactional
@Validated
-public class TeacherMergeApplicationService extends CoreBaseService{
+@Slf4j
+public class TeacherMergeApplicationService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherMergeApplicationDao teacherMergeApplicationDao;
@@ -241,4 +243,14 @@ public class TeacherMergeApplicationService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseChatLogService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseChatLogDao teacherOpenCourseChatLogDao;
@@ -147,4 +149,14 @@ public class TeacherOpenCourseChatLogService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseHandsOnService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseHandsOnDao teacherOpenCourseHandsOnDao;
@Autowired private HandsOnService handsOnService;
@@ -270,4 +271,14 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseHandsOnSimulationTasksFileService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseHandsOnSimulationTasksFileDao teacherOpenCourseHandsOnSimulationTasksFileDao;
@@ -150,4 +152,13 @@ public class TeacherOpenCourseHandsOnSimulationTasksFileService extends CoreBase
}
}
+ @Override
+ public void resetOperationByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("不需要实现重置操作!");
+ }
+
+ @Override
+ public void deleteTeacherOpenCourseAllRelatedByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("需要实现删除操作!");
+ }
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java
index 85c079f2..7800ef3c 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java
@@ -12,6 +12,7 @@ import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVO;
import com.ibeetl.jlw.enums.HandsOnTaskEnum;
import com.ibeetl.jlw.web.query.*;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.SqlId;
@@ -33,7 +34,8 @@ import java.util.stream.Collectors;
@Service
@Transactional
@Validated
-public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseHandsOnSimulationTasksDao teacherOpenCourseHandsOnSimulationTasksDao;
@@ -266,4 +268,14 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
studentPageQuery.setList(list);
return studentPageQuery;
}
+
+ @Override
+ public void resetOperationByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("不需要实现重置操作!");
+ }
+
+ @Override
+ public void deleteTeacherOpenCourseAllRelatedByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("需要实现删除操作!");
+ }
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointRelationService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointRelationService.java
index c55037bf..c35e81a7 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointRelationService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointRelationService.java
@@ -10,6 +10,7 @@ import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.TeacherOpenCourseKnowledgePointRelationDao;
import com.ibeetl.jlw.entity.TeacherOpenCourseKnowledgePointRelation;
import com.ibeetl.jlw.web.query.TeacherOpenCourseKnowledgePointRelationQuery;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.SqlId;
import org.beetl.sql.core.engine.PageQuery;
@@ -29,7 +30,8 @@ import java.util.List;
@Service
@Transactional
@Validated
-public class TeacherOpenCourseKnowledgePointRelationService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseKnowledgePointRelationService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseKnowledgePointRelationDao teacherOpenCourseKnowledgePointRelationDao;
@@ -150,4 +152,14 @@ public class TeacherOpenCourseKnowledgePointRelationService extends CoreBaseServ
}
}
+ @Override
+ public void resetOperationByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("不需要实现重置操作!");
+ }
+
+ @Override
+ public void deleteTeacherOpenCourseAllRelatedByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("需要实现删除操作!");
+ }
+
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointService.java
index e0eec95f..4c4eca47 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseKnowledgePointService.java
@@ -10,6 +10,7 @@ import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.TeacherOpenCourseKnowledgePointDao;
import com.ibeetl.jlw.entity.TeacherOpenCourseKnowledgePoint;
import com.ibeetl.jlw.web.query.TeacherOpenCourseKnowledgePointQuery;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.SqlId;
import org.beetl.sql.core.engine.PageQuery;
@@ -29,7 +30,8 @@ import java.util.List;
@Service
@Transactional
@Validated
-public class TeacherOpenCourseKnowledgePointService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseKnowledgePointService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseKnowledgePointDao teacherOpenCourseKnowledgePointDao;
@@ -146,4 +148,14 @@ public class TeacherOpenCourseKnowledgePointService extends CoreBaseService beansOfType = SpringUtil.getBeansOfType(DeleteResourcesBy.class);
// 调用子类实现
- beansOfType.forEach((beanName, bean) -> bean.deleteByTeacherOpenCourseId(teacherOpenCourseId));
+ beansOfType.forEach((beanName, bean) -> bean.resetOperationByTeacherOpenCourseId(teacherOpenCourseId));
// 清理缓存
invalidateAllCleanUpCourseInfoTreeLocalCache();
}
+
/**
* 教师端-重置操作之一
* 根据开课ID清空教师开课课程章节小节离线信息
@@ -626,7 +627,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService values = getValuesByQuery(courseInfoQuery);
+
+ // 根据ID删除数据
+ Set delIdList = values.stream().map(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseMergeCourseInfoId).collect(toSet());
+ deleteTeacherOpenCourseMergeCourseInfo(join(delIdList.toArray(), ","));
+ }
+
/**
* 根据开课课程ID获取开课课程信息
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
index 768ed673..ba08f109 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesInfoService.java
@@ -351,9 +351,14 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService<
* @param teacherOpenCourseId
*/
@Override
- public void deleteByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ public void resetOperationByTeacherOpenCourseId(Long teacherOpenCourseId) {
TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = new TeacherOpenCourseMergeResourcesInfo();
teacherOpenCourseMergeResourcesInfo.setTeacherOpenCourseId(teacherOpenCourseId);
deleteByCondition(teacherOpenCourseMergeResourcesInfo);
}
+
+ @Override
+ public void deleteTeacherOpenCourseAllRelatedByTeacherOpenCourseId(Long teacherOpenCourseId) {
+
+ }
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java
index 4022649a..1969e7d5 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java
@@ -411,12 +411,17 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ
*/
@Override
- public void deleteByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ public void resetOperationByTeacherOpenCourseId(Long teacherOpenCourseId) {
TeacherOpenCourseMergeResourcesQuestion teacherOpenCourseIdCondition = new TeacherOpenCourseMergeResourcesQuestion();
teacherOpenCourseIdCondition.setTeacherOpenCourseId(teacherOpenCourseId);
deleteByCondition(teacherOpenCourseIdCondition);
}
+ @Override
+ public void deleteTeacherOpenCourseAllRelatedByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ resetOperationByTeacherOpenCourseId(teacherOpenCourseId);
+ }
+
/**
* 根据开课ID获取下面的题目类型和类型下的总题数
* @param teacherOpenCourseId
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeScheduleSessionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeScheduleSessionService.java
index 04df2c3b..3c338b20 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeScheduleSessionService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeScheduleSessionService.java
@@ -12,6 +12,7 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseMergeScheduleSessionDao;
import com.ibeetl.jlw.entity.FileEntity;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeScheduleSession;
import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeScheduleSessionQuery;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Row;
@@ -38,7 +39,8 @@ import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
@Service
@Transactional
@Validated
-public class TeacherOpenCourseMergeScheduleSessionService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseMergeScheduleSessionService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseMergeScheduleSessionDao teacherOpenCourseMergeScheduleSessionDao;
@@ -288,4 +290,13 @@ public class TeacherOpenCourseMergeScheduleSessionService extends CoreBaseServic
}
+ @Override
+ public void resetOperationByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("不需要实现重置操作!");
+ }
+
+ @Override
+ public void deleteTeacherOpenCourseAllRelatedByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("需要实现删除操作!");
+ }
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java
index dbb3658e..78564caf 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeSchoolClassService.java
@@ -10,6 +10,7 @@ import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.TeacherOpenCourseMergeSchoolClassDao;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeSchoolClass;
import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeSchoolClassQuery;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.SqlId;
import org.beetl.sql.core.engine.PageQuery;
@@ -28,7 +29,8 @@ import java.util.List;
@Service
@Transactional
-public class TeacherOpenCourseMergeSchoolClassService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseMergeSchoolClassService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseMergeSchoolClassDao teacherOpenCourseMergeSchoolClassDao;
@@ -158,4 +160,14 @@ public class TeacherOpenCourseMergeSchoolClassService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseMergeStudentService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private UserConsoleService userConsoleService;
@@ -256,4 +258,14 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseMergeTeacherService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseMergeTeacherDao teacherOpenCourseMergeTeacherDao;
@@ -290,4 +292,14 @@ public class TeacherOpenCourseMergeTeacherService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseNoticeService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseNoticeDao teacherOpenCourseNoticeDao;
@@ -153,4 +155,14 @@ public class TeacherOpenCourseNoticeService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseQuestionLogService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseQuestionLogDao teacherOpenCourseQuestionLogDao;
@Autowired private StudentDao studentDao;
@@ -443,4 +445,13 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseQuestionLogWrongService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseQuestionLogWrongDao teacherOpenCourseQuestionLogWrongDao;
@@ -405,4 +407,14 @@ public class TeacherOpenCourseQuestionLogWrongService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseQuestionSettingService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseQuestionSettingDao teacherOpenCourseQuestionSettingDao;
@Autowired private ResourcesQuestionSnapshotService resourcesQuestionSnapshotService;
@@ -165,4 +167,14 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseScheduleSessionClassService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseScheduleSessionClassDao teacherOpenCourseScheduleSessionClassDao;
@@ -182,4 +184,14 @@ public class TeacherOpenCourseScheduleSessionClassService extends CoreBaseServic
}
}
+ @Override
+ public void resetOperationByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("不需要实现重置操作!");
+ }
+
+ @Override
+ public void deleteTeacherOpenCourseAllRelatedByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("需要实现删除操作!");
+ }
+
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
index 270d0c5c..5b16401d 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionService.java
@@ -27,6 +27,7 @@ import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionClassQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionQuery;
import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.assertj.core.util.Lists;
import org.beetl.sql.core.SqlId;
@@ -57,7 +58,8 @@ import static java.util.stream.Collectors.toMap;
@Service
@Transactional
-public class TeacherOpenCourseScheduleSessionService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseScheduleSessionService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseScheduleSessionDao teacherOpenCourseScheduleSessionDao;
@@ -424,4 +426,14 @@ public class TeacherOpenCourseScheduleSessionService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseScheduleSessionSnapService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseScheduleSessionSnapDao teacherOpenCourseScheduleSessionSnapDao;
@@ -145,4 +147,14 @@ public class TeacherOpenCourseScheduleSessionSnapService extends CoreBaseService
}
}
+ @Override
+ public void resetOperationByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("不需要实现重置操作!");
+ }
+
+ @Override
+ public void deleteTeacherOpenCourseAllRelatedByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("需要实现删除操作!");
+ }
+
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionTagService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionTagService.java
index 10fa803f..158b3e69 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionTagService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScheduleSessionTagService.java
@@ -10,6 +10,7 @@ import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.TeacherOpenCourseScheduleSessionTagDao;
import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionTag;
import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionTagQuery;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.beetl.sql.core.SqlId;
import org.beetl.sql.core.engine.PageQuery;
@@ -29,7 +30,8 @@ import java.util.List;
@Service
@Transactional
-public class TeacherOpenCourseScheduleSessionTagService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseScheduleSessionTagService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseScheduleSessionTagDao teacherOpenCourseScheduleSessionTagDao;
@@ -147,4 +149,13 @@ public class TeacherOpenCourseScheduleSessionTagService extends CoreBaseService<
}
}
+ @Override
+ public void resetOperationByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("不需要实现重置操作!");
+ }
+
+ @Override
+ public void deleteTeacherOpenCourseAllRelatedByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("需要实现删除操作!");
+ }
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java
index 4459fbb5..acc9030e 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java
@@ -16,6 +16,7 @@ import com.ibeetl.jlw.entity.FileEntity;
import com.ibeetl.jlw.entity.TeacherOpenCourseScoreDashboard;
import com.ibeetl.jlw.entity.TeacherOpenCourseScoreWeight;
import com.ibeetl.jlw.web.query.TeacherOpenCourseScoreDashboardQuery;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
@@ -43,7 +44,8 @@ import java.util.*;
@Service
@Transactional
-public class TeacherOpenCourseScoreDashboardService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseScoreDashboardService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseScoreDashboardDao teacherOpenCourseScoreDashboardDao;
@@ -489,4 +491,13 @@ public class TeacherOpenCourseScoreDashboardService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseScoreWeightService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseScoreWeightDao teacherOpenCourseScoreWeightDao;
@@ -144,4 +146,13 @@ public class TeacherOpenCourseScoreWeightService extends CoreBaseService
private TeacherOpenCourseMergeTeacherService teacherOpenCourseMergeTeacherService;
@Autowired
private TeacherOpenCourseMergeCourseInfoService teacherOpenCourseMergeCourseInfoService;
+
+ @Autowired private TeacherOpenCourseMergeCourseInfoDao teacherOpenCourseMergeCourseInfoDao;
@Autowired
private TeacherService teacherService;
@@ -73,9 +79,25 @@ public class TeacherOpenCourseService extends CoreBaseService
}
}
+ /**
+ * 删除教师开课,附带删除所有有关开课相关联的东西
+ * @param ids
+ */
public void deleteTeacherOpenCourse(String ids){
try {
teacherOpenCourseDao.deleteTeacherOpenCourseByIds(ids);
+
+ // 获取接口的具体实现类
+ Map beansOfType = SpringUtil.getBeansOfType(DeleteResourcesBy.class);
+ // 根据开课ID,循环重置开课课程。包含题目,资源等信息。
+ for (String teacherOpenCourseId : ids.split(",")) {
+ // 调用子类实现
+ BiConsumer stringDeleteResourcesByBiConsumer =
+ (beanName, bean) -> bean.deleteTeacherOpenCourseAllRelatedByTeacherOpenCourseId(Long.valueOf(teacherOpenCourseId));
+ beansOfType.forEach(stringDeleteResourcesByBiConsumer);
+ }
+ // 清理缓存
+ teacherOpenCourseMergeCourseInfoService.invalidateAllCleanUpCourseInfoTreeLocalCache();
} catch (Exception e) {
throw new PlatformException("批量删除TeacherOpenCourse失败", e);
}
diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
index 3f5dc1e7..4c54ac14 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseStudentSigninLogService.java
@@ -31,6 +31,7 @@ import com.ibeetl.jlw.entity.vo.TeacherOpenCourseStudentSigninLogSummaryVO;
import com.ibeetl.jlw.enums.StartStatusEnum;
import com.ibeetl.jlw.validator.TeacherOpenCourseStudentSigninLogSigninDTOValidator;
import com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninLogQuery;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Row;
@@ -69,7 +70,8 @@ import static com.ibeetl.jlw.web.query.TeacherOpenCourseStudentSigninLogQuery.Si
@Service
@Transactional
@Validated
-public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseStudentSigninLogDao teacherOpenCourseStudentSigninLogDao;
@Autowired private TeacherOpenCourseStudentSigninSettingDao teacherOpenCourseStudentSigninSettingDao;
@@ -621,4 +623,14 @@ public class TeacherOpenCourseStudentSigninLogService extends CoreBaseService{
+@Slf4j
+public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseService implements DeleteResourcesBy{
@Autowired private TeacherOpenCourseStudentSigninSettingDao teacherOpenCourseStudentSigninSettingDao;
@Autowired private TeacherOpenCourseStudentSigninSettingQueryValidator settingQueryValidator;
@@ -200,4 +202,14 @@ public class TeacherOpenCourseStudentSigninSettingService extends CoreBaseServic
}
+
+ @Override
+ public void resetOperationByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("不需要实现重置操作!");
+ }
+
+ @Override
+ public void deleteTeacherOpenCourseAllRelatedByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ log.info("需要实现删除操作!");
+ }
}
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java
index 1955c96a..3a2349c7 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeCourseInfoController.java
@@ -472,9 +472,9 @@ public class TeacherOpenCourseMergeCourseInfoController{
* @return
*/
@PostMapping(API + "/deleteAllResourcesByTeacherOpenCourseId.do")
- public JsonResult deleteAllResourcesByTeacherOpenCourseId(Long teacherOpenCourseId) {
+ public JsonResult courseInfoResetOperation(Long teacherOpenCourseId) {
Assert.notNull(getUser(), "请登录后再操作");
- teacherOpenCourseMergeCourseInfoService.deleteAllResourcesByTeacherOpenCourseId(teacherOpenCourseId);
+ teacherOpenCourseMergeCourseInfoService.courseInfoResetOperation(teacherOpenCourseId);
return JsonResult.success();
}
diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeCourseInfo.md b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeCourseInfo.md
index 34ea8101..9fcc292c 100644
--- a/web/src/main/resources/sql/jlw/teacherOpenCourseMergeCourseInfo.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourseMergeCourseInfo.md
@@ -202,6 +202,14 @@ deleteTeacherOpenCourseMergeCourseInfoByIds
delete from teacher_open_course_merge_course_info where find_in_set(teacher_open_course_merge_course_info_id,#ids#)
+deleteMergeCourseInfoByTeacherOpenCourseIds
+===
+
+* 根据开课ID集合批量删除
+
+ delete from teacher_open_course_merge_course_info where find_in_set(teacher_open_course_id,#teacherOpenCourseIds#)
+
+
getByIds
===