From b1cdb266b40ee1bff505355c1d1fb628ee5211ed Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Wed, 19 Mar 2025 16:54:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=EF=BC=9A?= =?UTF-8?q?=201=E3=80=81=E8=B0=83=E6=95=B4=E6=9C=8D=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E3=80=81=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E6=A0=87=E7=AD=BE=E5=88=A0=E9=99=A4=E6=A3=80?= =?UTF-8?q?=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigServiceTypeController.java | 6 ++ .../service/IConfigServiceTypeService.java | 6 ++ .../impl/ConfigServiceTypeServiceImpl.java | 30 +++++++- .../controller/DirectiveTagController.java | 6 ++ .../service/IDirectiveTagService.java | 6 ++ .../service/impl/DirectiveTagServiceImpl.java | 26 ++++++- .../ConfigServiceCategoryController.java | 6 ++ .../IConfigServiceCategoryService.java | 6 ++ .../ConfigServiceCategoryServiceImpl.java | 43 +++++++++++- .../ConfigServiceDirectiveController.java | 4 ++ .../entity/ConfigServiceDirective.java | 1 + .../mapper/ConfigServiceDirectiveMapper.java | 6 ++ .../xml/ConfigServiceDirectiveMapper.xml | 70 ++----------------- .../IConfigServiceDirectiveService.java | 6 ++ .../ConfigServiceDirectiveServiceImpl.java | 9 +++ 15 files changed, 165 insertions(+), 66 deletions(-) diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java index ea0d394..39ee490 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/controller/ConfigServiceTypeController.java @@ -101,6 +101,9 @@ public class ConfigServiceTypeController extends JeecgController delete(@RequestParam(name = "id", required = true) String id) { + if(configServiceTypeService.isUsed(id)){ + return Result.error("已被使用，无法删除!"); + } configServiceTypeService.removeById(id); return Result.OK("删除成功!"); } @@ -115,6 +118,9 @@ public class ConfigServiceTypeController extends JeecgController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + if(configServiceTypeService.isUsed(ids)){ + return Result.error("已被使用，无法删除!"); + } this.configServiceTypeService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java index 0c120fb..4f4e594 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/service/IConfigServiceTypeService.java @@ -11,4 +11,10 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IConfigServiceTypeService extends IService { + /** + * 查询数据是否已被使用 + * @param ids + * @return + */ + boolean isUsed(String id); } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java index 91a39b4..4d3adc7 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/ServiceType/service/impl/ConfigServiceTypeServiceImpl.java @@ -1,19 +1,47 @@ package com.nu.modules.ServiceType.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.nu.modules.ServiceType.entity.ConfigServiceType; import com.nu.modules.ServiceType.mapper.ConfigServiceTypeMapper; import com.nu.modules.ServiceType.service.IConfigServiceTypeService; +import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; +import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Arrays; +import java.util.List; + /** * @Description: 服务类型 * @Author: 张明远 - * @Date: 2025-03-13 + * @Date: 2025-03-13 * @Version: V1.0 */ @Service public class ConfigServiceTypeServiceImpl extends ServiceImpl implements IConfigServiceTypeService { + @Autowired + private IConfigServiceDirectiveService configServiceDirectiveService; + + @Override + public boolean isUsed(String ids) { + if (StringUtils.isBlank(ids)) { + return false; + } + boolean result = false; + //是否已被服务指令使用 + LambdaQueryWrapper configServiceDirectiveLambdaQueryWrapper = new LambdaQueryWrapper<>(); + configServiceDirectiveLambdaQueryWrapper.in(ConfigServiceDirective::getTypeId, Arrays.asList(ids.split(","))); + configServiceDirectiveLambdaQueryWrapper.eq(ConfigServiceDirective::getDelFlag, "0"); + List configServiceDirectives = configServiceDirectiveService.list(configServiceDirectiveLambdaQueryWrapper); + if (!(configServiceDirectives == null || configServiceDirectives.isEmpty())) { + result = true; + } + + return result; + } } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java index 0e61ad3..6d9540e 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/controller/DirectiveTagController.java @@ -101,6 +101,9 @@ public class DirectiveTagController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { + if(directiveTagService.isUsed(id)){ + return Result.error("已被使用，无法删除!"); + } directiveTagService.removeById(id); return Result.OK("删除成功!"); } @@ -115,6 +118,9 @@ public class DirectiveTagController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { + if(directiveTagService.isUsed(ids)){ + return Result.error("已被使用，无法删除!"); + } this.directiveTagService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java index 5578f80..9cff657 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/IDirectiveTagService.java @@ -11,4 +11,10 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IDirectiveTagService extends IService { + /** + * 查询数据是否已被使用 + * @param ids + * @return + */ + boolean isUsed(String id); } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java index dd48952..c681106 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/directiveTag/service/impl/DirectiveTagServiceImpl.java @@ -1,19 +1,43 @@ package com.nu.modules.directiveTag.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.nu.modules.directiveTag.entity.DirectiveTag; import com.nu.modules.directiveTag.mapper.DirectiveTagMapper; import com.nu.modules.directiveTag.service.IDirectiveTagService; +import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; +import com.nu.modules.serviceDirective.mapper.ConfigServiceDirectiveMapper; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Arrays; +import java.util.List; + /** * @Description: 指令标签 * @Author: 张明远 - * @Date: 2025-03-17 + * @Date: 2025-03-17 * @Version: V1.0 */ @Service public class DirectiveTagServiceImpl extends ServiceImpl implements IDirectiveTagService { + @Autowired + private ConfigServiceDirectiveMapper serviceDirectiveMapper; + + @Override + public boolean isUsed(String ids) { + if (StringUtils.isBlank(ids)) { + return false; + } + boolean result = false; + //是否已被服务指令使用 + int i = serviceDirectiveMapper.queryCountByTagIds(Arrays.asList(ids.split(","))); + if (i > 0) { + result = true; + } + return result; + } } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java index 29f2c9f..520b32a 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/controller/ConfigServiceCategoryController.java @@ -101,6 +101,9 @@ public class ConfigServiceCategoryController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { + if(configServiceCategoryService.isUsed(id)){ + return Result.error("已被使用，无法删除!"); + } configServiceCategoryService.removeById(id); return Result.OK("删除成功!"); } @@ -115,6 +118,9 @@ public class ConfigServiceCategoryController extends JeecgController deleteBatch(@RequestParam(name="ids",required=true) String ids) { + if(configServiceCategoryService.isUsed(ids)){ + return Result.error("已被使用，无法删除!"); + } this.configServiceCategoryService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java index 6a9b142..95de7ac 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/service/IConfigServiceCategoryService.java @@ -11,4 +11,10 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface IConfigServiceCategoryService extends IService { + /** + * 查询数据是否已被使用 + * @param ids + * @return + */ + boolean isUsed(String ids); } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java index 0d56112..1fc9f44 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceCategory/service/impl/ConfigServiceCategoryServiceImpl.java @@ -1,19 +1,60 @@ package com.nu.modules.serviceCategory.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.nu.modules.ServiceType.entity.ConfigServiceType; +import com.nu.modules.ServiceType.service.IConfigServiceTypeService; import com.nu.modules.serviceCategory.entity.ConfigServiceCategory; import com.nu.modules.serviceCategory.mapper.ConfigServiceCategoryMapper; import com.nu.modules.serviceCategory.service.IConfigServiceCategoryService; +import com.nu.modules.serviceDirective.entity.ConfigServiceDirective; +import com.nu.modules.serviceDirective.service.IConfigServiceDirectiveService; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.Arrays; +import java.util.List; + /** * @Description: 服务类别 * @Author: 张明远 - * @Date: 2025-03-13 + * @Date: 2025-03-13 * @Version: V1.0 */ @Service public class ConfigServiceCategoryServiceImpl extends ServiceImpl implements IConfigServiceCategoryService { + @Autowired + private IConfigServiceTypeService configServiceTypeService; + @Autowired + private IConfigServiceDirectiveService configServiceDirectiveService; + + @Override + public boolean isUsed(String ids) { + if (StringUtils.isBlank(ids)) { + return false; + } + boolean result = false; + //是否已被服务类型使用 + LambdaQueryWrapper configServiceTypeLambdaQueryWrapper = new LambdaQueryWrapper<>(); + configServiceTypeLambdaQueryWrapper.in(ConfigServiceType::getCategoryId, Arrays.asList(ids.split(","))); + configServiceTypeLambdaQueryWrapper.eq(ConfigServiceType::getDelFlag, "0"); + List configServiceTypes = configServiceTypeService.list(configServiceTypeLambdaQueryWrapper); + if (configServiceTypes == null || configServiceTypes.isEmpty()) { + //是否已被服务指令使用 + LambdaQueryWrapper configServiceDirectiveLambdaQueryWrapper = new LambdaQueryWrapper<>(); + configServiceDirectiveLambdaQueryWrapper.in(ConfigServiceDirective::getCategoryId, Arrays.asList(ids.split(","))); + configServiceDirectiveLambdaQueryWrapper.eq(ConfigServiceDirective::getDelFlag, "0"); + List configServiceDirectives = configServiceDirectiveService.list(configServiceDirectiveLambdaQueryWrapper); + if (!(configServiceDirectives == null || configServiceDirectives.isEmpty())) { + result = true; + } + } else { + result = true; + } + + return result; + } } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java index f2f2149..b5d952b 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/controller/ConfigServiceDirectiveController.java @@ -90,6 +90,8 @@ public class ConfigServiceDirectiveController extends JeecgController tagList; } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java index c16c4cd..7cb10e2 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/ConfigServiceDirectiveMapper.java @@ -34,4 +34,10 @@ public interface ConfigServiceDirectiveMapper extends BaseMapper tagIds); } diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml index 22dfe2e..81584bf 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -75,69 +75,13 @@ ORDER BY c.category_id ASC, c.type_id ASC, c.instruction_tag_id ASC,c.create_time desc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + delete diff --git a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java index 65464e9..c73d7a0 100644 --- a/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java +++ b/nursing-unit-config/nu-config-biz/src/main/java/com/nu/modules/serviceDirective/service/IConfigServiceDirectiveService.java @@ -26,4 +26,10 @@ public interface IConfigServiceDirectiveService extends IService