diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/DictionaryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/DictionaryController.java index 18fe3fe3..ac5a4b32 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/DictionaryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/DictionaryController.java @@ -70,7 +70,7 @@ public class DictionaryController extends BaseController { */ @PostMapping("deleteDictionary") @ApiMark(moduleName = "字典管理", apiName = "删除字典") - public ApiResult deleteDictionary(@Valid @RequestBody @NotEmpty List ids) { + public ApiResult deleteDictionary(@Valid @RequestBody @NotEmpty List ids) { dictionaryControllerService.deleteDictionary(ids); return ApiResult.success(); } @@ -103,7 +103,7 @@ public class DictionaryController extends BaseController { */ @PostMapping("deleteDictionaryItem") @ApiMark(moduleName = "字典管理", apiName = "删除字典值") - public ApiResult deleteDictionaryItem(@Valid @RequestBody @NotEmpty List ids) { + public ApiResult deleteDictionaryItem(@Valid @RequestBody @NotEmpty List ids) { dictionaryItemService.removeByIds(ids); return ApiResult.success(); } @@ -126,7 +126,7 @@ public class DictionaryController extends BaseController { @GetMapping("exportDictionaryItemTranslates") @ApiMark(moduleName = "字典管理", apiName = "导出字典值翻译列表") public ApiResult exportDictionaryItemTranslates(HttpServletResponse response - , @Validated @RequestParam @NotEmpty List dictionaryItemIds) throws IOException { + , @Validated @RequestParam @NotEmpty List dictionaryItemIds) throws IOException { dictionaryControllerService.exportDictionaryItemTranslates(response, dictionaryItemIds); return ApiResult.success(); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/FileController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/FileController.java index 305f3714..e2480db4 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/FileController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/FileController.java @@ -88,7 +88,7 @@ public class FileController extends BaseController { */ @PostMapping("deleteFile") @ApiMark(moduleName = "文件管理", apiName = "删除文件") - public ApiResult deleteFile(@Valid @RequestBody @NotEmpty List ids) { + public ApiResult deleteFile(@Valid @RequestBody @NotEmpty List ids) { fileControllerService.deleteFile(ids); return ApiResult.success(); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LDAPController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LDAPController.java index 8c1c2b9f..c291aea2 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LDAPController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LDAPController.java @@ -1,5 +1,6 @@ package com.nflg.wms.admin.controller; +import com.nflg.wms.admin.service.LDAPControllerService; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.qo.EnableQO; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MultilingualController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MultilingualController.java index 0f81c90d..c13a19dc 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MultilingualController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MultilingualController.java @@ -30,7 +30,6 @@ import java.util.List; /** * 多语言相关接口 - * * @author 曹鹏飞 */ @Slf4j @@ -43,7 +42,6 @@ public class MultilingualController extends BaseController { /** * 获取语言列表 - * * @return 语言列表 */ @GetMapping("/getAllLanguage") @@ -54,7 +52,6 @@ public class MultilingualController extends BaseController { /** * 获取启用的语言列表 - * * @return 取语言列表 */ @GetMapping("getLanguages") @@ -65,7 +62,6 @@ public class MultilingualController extends BaseController { /** * 启用/禁言语言 - * * @param request 请求参数 */ @PostMapping("/enableLanguage") @@ -77,7 +73,6 @@ public class MultilingualController extends BaseController { /** * 获取所有模块 - * * @return 模块列表 */ @PostMapping("/getModules") @@ -88,7 +83,6 @@ public class MultilingualController extends BaseController { /** * 获取所有页面 - * * @return 页面列表 */ @PostMapping("/getPages") @@ -99,7 +93,6 @@ public class MultilingualController extends BaseController { /** * 搜索网页组件 - * * @param request 请求参数 * @return 组件列表 */ @@ -111,7 +104,6 @@ public class MultilingualController extends BaseController { /** * 删除网页组件 - * * @param ids 组件id列表 */ @PostMapping("/deleteWebComponent") @@ -123,7 +115,6 @@ public class MultilingualController extends BaseController { /** * 导出网页组件翻译列表 - * * @param request 请求参数 */ @PostMapping("exportWebComponentTranslates") @@ -135,7 +126,6 @@ public class MultilingualController extends BaseController { /** * 导入字典值翻译列表 - * * @param file 文件 */ @PostMapping("importWebComponentTranslates") @@ -151,7 +141,6 @@ public class MultilingualController extends BaseController { /** * 获取网页组件详情 - * * @return 组件详情 */ @GetMapping("/getWebComponentInfo") @@ -162,7 +151,6 @@ public class MultilingualController extends BaseController { /** * 添加网页组件 - * * @return 组件详情 */ @PostMapping("/addWebComponent") @@ -174,7 +162,6 @@ public class MultilingualController extends BaseController { /** * 更新网页组件 - * * @return 组件详情 */ @PostMapping("/updateWebComponent") diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DictionaryControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DictionaryControllerService.java index 296cdb42..1be245ea 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DictionaryControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DictionaryControllerService.java @@ -81,7 +81,7 @@ public class DictionaryControllerService { * * @param ids id列表 */ - public void deleteDictionary(@Valid @RequestBody @NotEmpty List ids) { + public void deleteDictionary(@Valid @RequestBody @NotEmpty List ids) { dictionaryService.delete(ids); } @@ -120,7 +120,7 @@ public class DictionaryControllerService { * @param dictionaryItemIds 字典值id列表 */ public void exportDictionaryItemTranslates(HttpServletResponse response - , @Validated @RequestParam @NotEmpty List dictionaryItemIds) throws IOException { + , @Validated @RequestParam @NotEmpty List dictionaryItemIds) throws IOException { List datas = dictionaryService.getAllLanguageByDictionaryItemIds(dictionaryItemIds); EecExcelUtil.export("字典翻译", "sheet1", datas, response); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/FileControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/FileControllerService.java index b438925b..7055bc67 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/FileControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/FileControllerService.java @@ -63,7 +63,7 @@ public class FileControllerService { return PageUtil.convert(datas, d -> Convert.convert(FileVO.class, d)); } - public void deleteFile(@Valid @NotEmpty List ids) { + public void deleteFile(@Valid @NotEmpty List ids) { fileUploadRecordService.removeBatchByIds(ids); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LDAPControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/LDAPControllerService.java similarity index 93% rename from nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LDAPControllerService.java rename to nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/LDAPControllerService.java index a27093ca..e7e59348 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LDAPControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/LDAPControllerService.java @@ -1,9 +1,7 @@ -package com.nflg.wms.admin.controller; +package com.nflg.wms.admin.service; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.nflg.wms.admin.service.DepartmentControllerService; -import com.nflg.wms.admin.service.LdapService; import com.nflg.wms.common.pojo.dto.AdDTO; import com.nflg.wms.common.pojo.qo.EnableQO; import com.nflg.wms.common.pojo.qo.LDAPAddQO; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Language.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Language.java index 5f1d20f4..e61c4c8c 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Language.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/Language.java @@ -2,11 +2,12 @@ package com.nflg.wms.repository.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; +import java.io.Serializable; + /** *

* 字典 @@ -59,4 +60,9 @@ public class Language implements Serializable { * 是否启用 */ private Boolean enable; -} + + /** + * 翻译时的语言代码 + */ + private String translateCode; +} \ No newline at end of file diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IDictionaryService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IDictionaryService.java index c54c1976..03c2dfec 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IDictionaryService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IDictionaryService.java @@ -24,7 +24,7 @@ public interface IDictionaryService extends IService { void save(SaveDictionaryQO request); - void delete(List ids); + void delete(List ids); - List getAllLanguageByDictionaryItemIds(@NotEmpty List dictionaryItemIds); + List getAllLanguageByDictionaryItemIds(@NotEmpty List dictionaryItemIds); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryServiceImpl.java index 5a63e9d1..62137810 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryServiceImpl.java @@ -85,7 +85,7 @@ public class DictionaryServiceImpl extends ServiceImpl ids) { + public void delete(List ids) { removeByIds(ids); List itemIds = dictionaryItemService.lambdaQuery().eq(DictionaryItem::getDictionaryId, ids).list().stream().map(DictionaryItem::getId).collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(itemIds)) { @@ -95,7 +95,7 @@ public class DictionaryServiceImpl extends ServiceImpl getAllLanguageByDictionaryItemIds(List dictionaryItemIds) { + public List getAllLanguageByDictionaryItemIds(List dictionaryItemIds) { List dictionaryItems = dictionaryItemService.lambdaQuery().in(DictionaryItem::getId, dictionaryItemIds).list(); VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(dictionaryItems)).throwMessage("字典值不存在"); Dictionary dictionary = getById(dictionaryItems.get(0).getDictionaryId());