diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DictionaryController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DictionaryController.java index 0fde205c..64b55464 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DictionaryController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DictionaryController.java @@ -103,7 +103,7 @@ public class DictionaryController extends ControllerBase { @MethodInfoMark(value = "删除字典", menuName = "字典管理") @ApiMark(moduleName = "字典管理", apiName = "删除字典") public ApiResult deleteDictionary(@Valid @RequestBody @NotEmpty List ids) { - dictionaryService.removeByIds(ids); + dictionaryService.delete(ids); return ApiResult.success(); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryService.java index 86a9256a..ba09d593 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/IDictionaryService.java @@ -7,6 +7,8 @@ import com.nflg.mobilebroken.common.pojo.request.SaveDictionaryRequest; import com.nflg.mobilebroken.common.pojo.vo.DictionaryVO; import com.nflg.mobilebroken.repository.entity.Dictionary; +import java.util.List; + /** *

* 字典 服务类 @@ -20,4 +22,6 @@ public interface IDictionaryService extends IService { void search(DictionarySearchRequest request, IPage page); void save(SaveDictionaryRequest request); + + void delete(List ids); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryServiceImpl.java index fd90279c..2f8fda23 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/DictionaryServiceImpl.java @@ -8,12 +8,20 @@ import com.nflg.mobilebroken.common.pojo.request.DictionarySearchRequest; import com.nflg.mobilebroken.common.pojo.request.SaveDictionaryRequest; import com.nflg.mobilebroken.common.util.AdminUserUtil; import com.nflg.mobilebroken.repository.entity.Dictionary; +import com.nflg.mobilebroken.repository.entity.DictionaryItem; +import com.nflg.mobilebroken.repository.entity.DictionaryItemTranslate; import com.nflg.mobilebroken.repository.mapper.DictionaryMapper; +import com.nflg.mobilebroken.repository.service.IDictionaryItemService; +import com.nflg.mobilebroken.repository.service.IDictionaryItemTranslateService; import com.nflg.mobilebroken.repository.service.IDictionaryService; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.time.LocalDateTime; +import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** *

@@ -26,6 +34,12 @@ import java.util.Objects; @Service public class DictionaryServiceImpl extends ServiceImpl implements IDictionaryService { + @Resource + private IDictionaryItemService dictionaryItemService; + + @Resource + private IDictionaryItemTranslateService dictionaryItemTranslateService; + @Override public void search(DictionarySearchRequest request, IPage page) { LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); @@ -58,4 +72,13 @@ public class DictionaryServiceImpl extends ServiceImpl ids) { + removeByIds(ids); + List itemIds=dictionaryItemService.lambdaQuery().eq(DictionaryItem::getDictionaryId, ids).list().stream().map(DictionaryItem::getId).collect(Collectors.toList()); + dictionaryItemService.removeByIds(itemIds); + dictionaryItemTranslateService.remove(new LambdaQueryWrapper().in(DictionaryItemTranslate::getDictionaryItemId, itemIds)); + } }