From 70e3cf2937322884a04030485b34bb50f646b20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 30 Jun 2025 18:13:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/wms/admin/controller/DictionaryController.java | 2 +- .../java/com/nflg/wms/admin/controller/MenuController.java | 4 ++-- .../nflg/wms/admin/controller/MultilingualController.java | 2 +- .../com/nflg/wms/admin/controller/SupplierController.java | 2 +- .../nflg/wms/admin/service/DictionaryControllerService.java | 2 +- .../com/nflg/wms/admin/service/MenuControllerService.java | 5 ++--- .../wms/admin/service/MultilingualControllerService.java | 2 +- .../com/nflg/wms/admin/service/UserControllerService.java | 2 +- .../main/java/com/nflg/wms/common/pojo/qo/ZipDownloadQO.java | 2 +- .../wms/repository/mapper/DictionaryItemTranslateMapper.java | 2 +- .../repository/service/IDictionaryItemTranslateService.java | 2 +- .../java/com/nflg/wms/repository/service/IMenuService.java | 2 +- .../service/impl/DictionaryItemTranslateServiceImpl.java | 2 +- .../nflg/wms/repository/service/impl/MenuServiceImpl.java | 2 +- 14 files changed, 16 insertions(+), 17 deletions(-) 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 ac5a4b32..fe019b99 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 @@ -115,7 +115,7 @@ public class DictionaryController extends BaseController { */ @GetMapping("getDictionaryItemTranslateList") @ApiMark(moduleName = "字典管理", apiName = "获取字典值翻译列表") - public ApiResult> getDictionaryItemTranslateList(@Valid @RequestParam @NotNull Integer id) { + public ApiResult> getDictionaryItemTranslateList(@Valid @RequestParam @NotNull Long id) { return ApiResult.success(dictionaryControllerService.getDictionaryItemTranslateList(id)); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MenuController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MenuController.java index b5af5540..365665b6 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MenuController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/MenuController.java @@ -61,7 +61,7 @@ public class MenuController extends BaseController { */ @PostMapping("deleteMenu") @ApiMark(moduleName = "菜单管理", apiName = "删除菜单") - public ApiResult deleteMenu(@Valid @RequestBody List ids) { + public ApiResult deleteMenu(@Valid @RequestBody List ids) { menuControllerService.delete(ids); return ApiResult.success(); } @@ -126,7 +126,7 @@ public class MenuController extends BaseController { */ @PostMapping("deleteMenuButton") @ApiMark(moduleName = "菜单管理", apiName = "删除菜单按钮") - public ApiResult deleteMenuButton(@Valid @RequestBody List ids) { + public ApiResult deleteMenuButton(@Valid @RequestBody List ids) { menuControllerService.deleteMenuButton(ids); return ApiResult.success(); } 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 c13a19dc..01e60b0c 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 @@ -108,7 +108,7 @@ public class MultilingualController extends BaseController { */ @PostMapping("/deleteWebComponent") @ApiMark(moduleName = "多语言管理", apiName = "删除网页组件") - public ApiResult deleteWebComponent(@Valid @RequestBody @NotEmpty List ids) { + public ApiResult deleteWebComponent(@Valid @RequestBody @NotEmpty List ids) { multilingualControllerService.deleteWebComponent(ids); return ApiResult.success(); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/SupplierController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/SupplierController.java index 617826cd..bcb34a07 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/SupplierController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/SupplierController.java @@ -136,7 +136,7 @@ public class SupplierController extends BaseController { * @param ids 选中的id集合 */ @PostMapping("export") - public void exportSelect(HttpServletResponse response,@Valid @RequestBody @NotEmpty List ids) throws Exception { + public void exportSelect(HttpServletResponse response,@Valid @RequestBody @NotEmpty List ids) throws Exception { userControllerService.exportSupplier(response,ids); } } 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 1be245ea..d99675be 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 @@ -110,7 +110,7 @@ public class DictionaryControllerService { * @param id 字典值id * @return 字典值翻译列表 */ - public List getDictionaryItemTranslateList(@Valid @RequestParam @NotNull Integer id) { + public List getDictionaryItemTranslateList(@Valid @RequestParam @NotNull Long id) { return dictionaryItemTranslateService.getListByDictionaryItemId(id); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MenuControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MenuControllerService.java index 02c45f85..6f740f03 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MenuControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MenuControllerService.java @@ -9,7 +9,6 @@ import com.nflg.wms.common.pojo.vo.ApiVO; import com.nflg.wms.common.pojo.vo.MenuAuthorizeVO; import com.nflg.wms.common.pojo.vo.MenuButtonVO; import com.nflg.wms.common.pojo.vo.MenuVO; -import com.nflg.wms.common.util.VUtil; import com.nflg.wms.repository.entity.DictionaryItem; import com.nflg.wms.repository.service.*; import jakarta.annotation.Resource; @@ -68,7 +67,7 @@ public class MenuControllerService { menuService.update(request); } - public void delete(@Valid List ids) { + public void delete(@Valid List ids) { menuService.delete(ids); } @@ -92,7 +91,7 @@ public class MenuControllerService { menuButtonService.enable(request); } - public void deleteMenuButton(@Valid List ids) { + public void deleteMenuButton(@Valid List ids) { menuButtonService.removeByIds(ids); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MultilingualControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MultilingualControllerService.java index 538693e7..add2270b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MultilingualControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MultilingualControllerService.java @@ -84,7 +84,7 @@ public class MultilingualControllerService { return webComponentService.search(request); } - public void deleteWebComponent(@Valid @NotEmpty List ids) { + public void deleteWebComponent(@Valid @NotEmpty List ids) { webComponentService.removeByIds(ids); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java index b7d4bee4..ed1004c3 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/UserControllerService.java @@ -484,7 +484,7 @@ public class UserControllerService { return false; } - public void exportSupplier(HttpServletResponse response, @Valid @NotEmpty List ids) throws IOException { + public void exportSupplier(HttpServletResponse response, @Valid @NotEmpty List ids) throws IOException { List users = vUserSupplierService.listByIds(ids); List suppliersCategory = dictionaryItemService.getListByDictionaryCode(Constant.DICTIONARY_SUPPLIERS_CATEGORY); List datas = users.stream().map(vu -> { diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ZipDownloadQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ZipDownloadQO.java index aff202cf..2dfdb367 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ZipDownloadQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ZipDownloadQO.java @@ -14,5 +14,5 @@ public class ZipDownloadQO { * 文件id列表 */ @NotEmpty - private List fileIds; + private List fileIds; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/DictionaryItemTranslateMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/DictionaryItemTranslateMapper.java index de8e913e..08b68c2d 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/DictionaryItemTranslateMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/DictionaryItemTranslateMapper.java @@ -16,7 +16,7 @@ import java.util.List; */ public interface DictionaryItemTranslateMapper extends BaseMapper { - List getListByDictionaryItemId(Integer id); + List getListByDictionaryItemId(Long id); List getAllByDictionaryCode(String code, String language); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IDictionaryItemTranslateService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IDictionaryItemTranslateService.java index 4d9a6896..f63024e2 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IDictionaryItemTranslateService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IDictionaryItemTranslateService.java @@ -16,7 +16,7 @@ import java.util.List; */ public interface IDictionaryItemTranslateService extends IService { - List getListByDictionaryItemId(Integer id); + List getListByDictionaryItemId(Long id); Long getId(Long dictionaryItemId, String code); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IMenuService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IMenuService.java index b56f028c..1fd762a3 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IMenuService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IMenuService.java @@ -33,7 +33,7 @@ public interface IMenuService extends IService { void update(@Valid MenuUpdateQO request); - void delete(@Valid List ids); + void delete(@Valid List ids); void enableMenu(@Valid EnableMenuQO request); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryItemTranslateServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryItemTranslateServiceImpl.java index 0f31e741..4cc26ff1 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryItemTranslateServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DictionaryItemTranslateServiceImpl.java @@ -30,7 +30,7 @@ public class DictionaryItemTranslateServiceImpl extends ServiceImpl getListByDictionaryItemId(Integer id) { + public List getListByDictionaryItemId(Long id) { List datas = baseMapper.getListByDictionaryItemId(id); List languages = languageService.getLanguages(); languages.forEach(l -> { diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MenuServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MenuServiceImpl.java index 58e9655c..abbb2348 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MenuServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MenuServiceImpl.java @@ -136,7 +136,7 @@ public class MenuServiceImpl extends ServiceImpl implements IM } @Override - public void delete(List ids) { + public void delete(List ids) { VUtil.trueThrowBusinessError(lambdaQuery().in(Menu::getParentId, ids).exists()).throwMessage("请先删除下级菜单"); VUtil.trueThrowBusinessError(menuButtonService.lambdaQuery().in(MenuButton::getMenuId, ids).exists()) .throwMessage("请先删除下级按钮");