From a977d224aceffdd0ce90a55fa2297ba65e9da513 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 19 Aug 2022 14:34:45 +0800 Subject: [PATCH] =?UTF-8?q?58408=20=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93-=E5=88=86=E7=B1=BB=E7=BB=B4=E6=8A=A4=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...blemKnowledgeBaseClassifyEOController.java | 8 ++--- ...ProblemKnowledgeBaseClassifyEOService.java | 4 +-- ...lemKnowledgeBaseClassifyEOServiceImpl.java | 30 +++++++++++++++++-- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java index 842aaafe4..6cf3c0a82 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java @@ -111,8 +111,8 @@ public class ProblemKnowledgeBaseClassifyEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { - problemKnowledgeBaseClassifyEOService.deleteById(id); + public Result delete(@RequestParam(name="id",required=true) String id,@RequestParam(name="cut",required=true) String cut) { + problemKnowledgeBaseClassifyEOService.deleteById(id,cut); return Result.OK("删除成功!"); } @@ -125,8 +125,8 @@ public class ProblemKnowledgeBaseClassifyEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.problemKnowledgeBaseClassifyEOService.deleteByIds(Arrays.asList(ids.split(","))); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="cut",required=true) String cut) { + this.problemKnowledgeBaseClassifyEOService.deleteByIds(Arrays.asList(ids.split(",")),cut); return Result.OK("批量删除成功!"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java index 00564d0f1..2ea94a93f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java @@ -34,7 +34,7 @@ public interface IProblemKnowledgeBaseClassifyEOService extends IService ids); + void deleteByIds(List ids,String cut); /** * 通过id查询 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java index 615865026..9cd6d40d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java @@ -1,8 +1,13 @@ package com.jero.modules.problemKnowledgeBase.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.exception.JeroBootException; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO; +import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseClassifyEOMapper; import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseClassifyEOService; +import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseEOService; import com.jero.modules.project.entity.ConditionAssessmentEO; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; @@ -30,6 +35,8 @@ import org.springframework.transaction.annotation.Transactional; public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseClassifyEOService { @Autowired private ISysUserService sysUserService; + @Autowired + private IProblemKnowledgeBaseEOService problemKnowledgeBaseEOService; /** * 保存 @@ -65,7 +72,8 @@ public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl ids) { + public void deleteByIds(List ids,String cut) { + checkData(ids,cut); removeByIds(ids); } @@ -144,4 +153,21 @@ public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl idList,String cut){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().in(ProblemKnowledgeBaseEO::getProblemType,idList); + List problemKnowledgeBaseEOS = this.problemKnowledgeBaseEOService.list(queryWrapper); + if(CollectionUtils.isNotEmpty(problemKnowledgeBaseEOS)){ + if(StringUtils.equals(cut, CutEnum.CN.getValue())){ + throw new JeroBootException("分类不能删除，已经被问题知识库引用！"); + }else if(StringUtils.equals(cut, CutEnum.EN.getValue())){ + throw new JeroBootException("Classification cannot be deleted, has been referenced by the problem knowledge base!"); + } + } + } }