From 9c09e2c1bbc8bc5e2248bc3ac0866d55916b25f8 Mon Sep 17 00:00:00 2001 From: caozhen <18736171426@139.com> Date: Thu, 14 Sep 2023 14:12:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A0=87=E5=87=86=E5=88=86?= =?UTF-8?q?=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsDomesticController.java | 4 ++++ .../controller/LawsEnterpriseController.java | 4 ++++ .../controller/LawsOverseasController.java | 4 ++++ .../service/ILawsStandardSharingService.java | 6 ++++++ .../impl/LawsStandardSharingServiceImpl.java | 20 ++++++++++++++++++- 5 files changed, 37 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index bf791b6b..a6c9c34e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -12,6 +12,7 @@ import com.jero.modules.laws.standard.entity.LawsUpdateRecord; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; import com.jero.modules.personal.service.ILawsStandardCollectionService; +import com.jero.modules.personal.service.ILawsStandardSharingService; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; import io.swagger.annotations.Api; @@ -41,6 +42,8 @@ public class LawsDomesticController { private ILawsStandardCollectionService lawsStandardCollectionService; @Autowired private ILawsUpdateRecordService lawsUpdateRecordService; + @Autowired + private ILawsStandardSharingService lawsStandardSharingService; private static final String MODULE_VALUE = TableNameEnum.DOMESTIC_REGULATIONS.getValue(); @@ -103,6 +106,7 @@ public class LawsDomesticController { public Result deleteByIdsAndModule(@RequestBody Map parameterMap) { //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); + lawsStandardSharingService.deleteByStandardId((String) parameterMap.get("ids")); return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index a066f3ec..db8d1bcf 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -12,6 +12,7 @@ import com.jero.modules.laws.standard.entity.LawsUpdateRecord; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; import com.jero.modules.personal.service.ILawsStandardCollectionService; +import com.jero.modules.personal.service.ILawsStandardSharingService; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; import io.swagger.annotations.Api; @@ -41,6 +42,8 @@ public class LawsEnterpriseController { private ILawsStandardCollectionService lawsStandardCollectionService; @Autowired private ILawsUpdateRecordService lawsUpdateRecordService; + @Autowired + private ILawsStandardSharingService lawsStandardSharingService; private static final String MODULE_VALUE = TableNameEnum.ENTERPRISE_STANDARDS.getValue(); @@ -102,6 +105,7 @@ public class LawsEnterpriseController { public Result deleteByIdsAndModule(@RequestBody Map parameterMap) { //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); + lawsStandardSharingService.deleteByStandardId((String) parameterMap.get("ids")); return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 9c8f6619..e4fc1e6f 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -12,6 +12,7 @@ import com.jero.modules.laws.standard.entity.LawsUpdateRecord; import com.jero.modules.laws.standard.service.ILawsNodeRelationService; import com.jero.modules.laws.standard.service.ILawsUpdateRecordService; import com.jero.modules.personal.service.ILawsStandardCollectionService; +import com.jero.modules.personal.service.ILawsStandardSharingService; import com.jero.modules.tag.entity.LawsTag; import com.jero.modules.tag.enums.TableNameEnum; import io.swagger.annotations.Api; @@ -41,6 +42,8 @@ public class LawsOverseasController { private ILawsStandardCollectionService lawsStandardCollectionService; @Autowired private ILawsUpdateRecordService lawsUpdateRecordService; + @Autowired + private ILawsStandardSharingService lawsStandardSharingService; private static final String MODULE_VALUE = TableNameEnum.FOREIGN_REGULATIONS.getValue(); @@ -102,6 +105,7 @@ public class LawsOverseasController { public Result deleteByIdsAndModule(@RequestBody Map parameterMap) { //删除标准时同步删除这个标准的收藏数据 lawsStandardCollectionService.deleteByStandardId((String) parameterMap.get("ids")); + lawsStandardSharingService.deleteByStandardId((String) parameterMap.get("ids")); return Result.OK(lawsCommonService.deleteByIdsAndModule((String) parameterMap.get("ids"), MODULE_VALUE)); } diff --git a/laws-modules/src/main/java/com/jero/modules/personal/service/ILawsStandardSharingService.java b/laws-modules/src/main/java/com/jero/modules/personal/service/ILawsStandardSharingService.java index a65cb0da..c492704e 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/service/ILawsStandardSharingService.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/service/ILawsStandardSharingService.java @@ -29,4 +29,10 @@ public interface ILawsStandardSharingService extends IService ids); + /** + * 删除标准分享 + */ + void deleteByStandardId(String id); + void deleteByStandardIds(List ids); + } diff --git a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java index e4c2e2fd..08f39bf4 100644 --- a/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/personal/service/impl/LawsStandardSharingServiceImpl.java @@ -1,7 +1,9 @@ package com.jero.modules.personal.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.jero.modules.personal.entity.LawsStandardCollection; import com.jero.modules.personal.entity.LawsStandardSharing; import com.jero.modules.personal.mapper.LawsStandardSharingMapper; import com.jero.modules.personal.service.ILawsStandardSharingService; @@ -46,7 +48,6 @@ public class LawsStandardSharingServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(LawsStandardSharing::getStandardId, id); + remove(wrapper); + } + + @Override + public void deleteByStandardIds(List ids) { + if (ids.isEmpty()){ + return; + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(LawsStandardSharing::getStandardId, ids); + remove(wrapper); + } + }