diff --git a/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/request/TranslationRequest.java b/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/request/TranslationRequest.java index 4aef0b800..743714a15 100644 --- a/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/request/TranslationRequest.java +++ b/kernel-d-i18n/i18n-api/src/main/java/cn/stylefeng/roses/kernel/i18n/api/pojo/request/TranslationRequest.java @@ -40,7 +40,7 @@ public class TranslationRequest extends BaseRequest { /** * 语种字典 */ - @NotBlank(message = "tranLanguageCode不能为空", groups = {add.class, edit.class, changeUserLanguage.class}) + @NotBlank(message = "tranLanguageCode不能为空", groups = {add.class, edit.class, changeUserLanguage.class, deleteTranLanguage.class}) private String tranLanguageCode; /** @@ -49,10 +49,22 @@ public class TranslationRequest extends BaseRequest { @NotBlank(message = "tranValue不能为空", groups = {add.class, edit.class}) private String tranValue; + /** + * 字典id,用在删除语种 + */ + @NotNull(message = "字典id", groups = {deleteTranLanguage.class}) + private Long dictId; + /** * 改变当前用户多语言 */ public @interface changeUserLanguage { } + /** + * 删除语种 + */ + public @interface deleteTranLanguage { + } + } diff --git a/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/controller/TranslationController.java b/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/controller/TranslationController.java index 5b9900458..95b38af38 100644 --- a/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/controller/TranslationController.java +++ b/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/controller/TranslationController.java @@ -65,6 +65,18 @@ public class TranslationController { return new SuccessResponseData(); } + /** + * 删除某个语种 + * + * @author fengshuonan + * @date 2021/1/24 19:20 + */ + @PostResource(name = "删除某个语种", path = "/i18n/deleteTranLanguage") + public ResponseData deleteTranLanguage(@RequestBody @Validated(TranslationRequest.deleteTranLanguage.class) TranslationRequest translationRequest) { + this.translationService.deleteTranLanguage(translationRequest); + return new SuccessResponseData(); + } + /** * 查看多语言详情 * diff --git a/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/service/TranslationService.java b/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/service/TranslationService.java index 407c42850..09ab7c2f8 100644 --- a/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/service/TranslationService.java +++ b/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/service/TranslationService.java @@ -70,4 +70,13 @@ public interface TranslationService extends IService, TranslationPe */ PageResult findPage(TranslationRequest translationRequest); + /** + * 删除语种 + * + * @param translationRequest 参数对象 + * @author fengshuonan + * @date 2021/1/30 10:00 + */ + void deleteTranLanguage(TranslationRequest translationRequest); + } diff --git a/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/service/impl/TranslationServiceImpl.java b/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/service/impl/TranslationServiceImpl.java index 6c8ddbcfc..e6188b586 100644 --- a/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/service/impl/TranslationServiceImpl.java +++ b/kernel-d-i18n/i18n-business/src/main/java/cn/stylefeng/roses/kernel/i18n/modular/service/impl/TranslationServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; +import cn.stylefeng.roses.kernel.dict.api.DictApi; import cn.stylefeng.roses.kernel.i18n.api.context.TranslationContext; import cn.stylefeng.roses.kernel.i18n.api.exception.TranslationException; import cn.stylefeng.roses.kernel.i18n.api.exception.enums.TranslationExceptionEnum; @@ -15,10 +16,12 @@ import cn.stylefeng.roses.kernel.i18n.modular.factory.TranslationDictFactory; import cn.stylefeng.roses.kernel.i18n.modular.mapper.TranslationMapper; import cn.stylefeng.roses.kernel.i18n.modular.service.TranslationService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -31,6 +34,9 @@ import java.util.List; @Service public class TranslationServiceImpl extends ServiceImpl implements TranslationService { + @Resource + private DictApi dictApi; + @Override public void add(TranslationRequest translationRequest) { Translation translation = new Translation(); @@ -79,6 +85,18 @@ public class TranslationServiceImpl extends ServiceImpl wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(Translation::getTranLanguageCode, translationRequest.getTranLanguageCode()); + this.remove(wrapper); + } + @Override public List getAllTranslationDict() { List list = this.list(); diff --git a/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/DictApi.java b/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/DictApi.java index ace55c096..2882fce9a 100644 --- a/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/DictApi.java +++ b/kernel-s-dict/dict-api/src/main/java/cn/stylefeng/roses/kernel/dict/api/DictApi.java @@ -41,4 +41,13 @@ public interface DictApi { */ List getDictDetailsByDictTypeCode(String dictTypeCode); + /** + * 删除字典,通过dictId + * + * @param dictId 字典id + * @author fengshuonan + * @date 2021/1/30 10:03 + */ + void deleteByDictId(Long dictId); + } diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java index c31a8016b..f26609f91 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/DictService.java @@ -122,7 +122,6 @@ public interface DictService extends IService, DictApi { */ List dictZTree(DictRequest dictRequest); - /** * 分页查询 * diff --git a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java index 26743fa03..d1eb68151 100644 --- a/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java +++ b/kernel-s-dict/dict-business/src/main/java/cn/stylefeng/roses/kernel/dict/modular/service/impl/DictServiceImpl.java @@ -353,6 +353,11 @@ public class DictServiceImpl extends ServiceImpl implements return simpleDictList; } + @Override + public void deleteByDictId(Long dictId) { + this.removeById(dictId); + } + /** * 批量修改pids的请求 *