diff --git a/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java index e2bfd872..1aee452e 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java @@ -1,5 +1,7 @@ package com.ibeetl.jlw.web; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Assert; import cn.hutool.json.JSONUtil; import cn.jlw.Interceptor.SCoreUser; import cn.jlw.validate.ValidateConfig; @@ -310,6 +312,18 @@ public class HandsOnController{ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ + // 判断按理名称重复,同小节和同章节下 + String handsOnName = handsOn.getHandsOnName(); + if (handsOnName != null && !handsOnName.isEmpty()) { + HandsOnQuery query = new HandsOnQuery(); + query.setCourseInfoId(handsOn.getCourseInfoId()); + query.setCourseChildNode(handsOn.getCourseChildNode()); + query.setHandsOnName(handsOnName); + List valuesByQuery = handsOnService.getValuesByQuery(query); + + Assert.isTrue(CollectionUtil.isEmpty(valuesByQuery), "同一小节或者章节下,不允许重复的案例名称,请修改后再次提交!"); + } + handsOn.setAddTime(new Date()); handsOn.setOrgId(coreUser.getOrgId()); handsOn.setUserId(coreUser.getId()); diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesCompetitionController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesCompetitionController.java index d4e489db..2c89ec74 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesCompetitionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesCompetitionController.java @@ -1,5 +1,7 @@ package com.ibeetl.jlw.web; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Assert; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.file.FileService; @@ -124,6 +126,17 @@ public class ResourcesCompetitionController{ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ + // 判断按理名称重复,同小节和同章节下 + String resourcesCompetitionName = resourcesCompetition.getResourcesCompetitionName(); + if (resourcesCompetitionName != null && !resourcesCompetitionName.isEmpty()) { + ResourcesCompetitionQuery query = new ResourcesCompetitionQuery(); + query.setCourseInfoId(resourcesCompetition.getCourseInfoId()); + query.setResourcesCompetitionName(resourcesCompetitionName); + List valuesByQuery = resourcesCompetitionService.getValuesByQuery(query); + + Assert.isTrue(CollectionUtil.isEmpty(valuesByQuery), "同一小节或者章节下,不允许重复的案例名称,请修改后再次提交!"); + } + resourcesCompetitionService.add(resourcesCompetition); //移除缓存 diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesTrainingController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesTrainingController.java index 4978ebb6..862f7504 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesTrainingController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesTrainingController.java @@ -1,5 +1,7 @@ package com.ibeetl.jlw.web; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Assert; import cn.jlw.validate.ValidateConfig; import com.ibeetl.admin.core.annotation.Function; import com.ibeetl.admin.core.file.FileService; @@ -123,6 +125,18 @@ public class ResourcesTrainingController{ if(result.hasErrors()){ return JsonResult.failMessage(result); }else{ + // 判断按理名称重复,同小节和同章节下 + String resourcesTrainingName = resourcesTraining.getResourcesTrainingName(); + if (resourcesTrainingName != null && !resourcesTrainingName.isEmpty()) { + ResourcesTrainingQuery query = new ResourcesTrainingQuery(); + query.setCourseInfoId(resourcesTraining.getCourseInfoId()); + query.setResourcesTrainingName(resourcesTrainingName); + List valuesByQuery = resourcesTrainingService.getValuesByQuery(query); + + Assert.isTrue(CollectionUtil.isEmpty(valuesByQuery), "同一小节或者章节下,不允许重复的案例名称,请修改后再次提交!"); + } + + resourcesTraining.setResourcesTrainingName(resourcesTraining.getResourcesTrainingName().trim()); resourcesTrainingService.add(resourcesTraining); //移除缓存