diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java index 47f50fc49a18e8d8a9b481eac20f103a6ee2e13d..e31600cb173af6ef7cc33b0d7c00c8d8ad8eb839 100644 --- a/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java +++ b/yudao-framework/yudao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/mapper/BaseMapperX.java @@ -47,12 +47,12 @@ public interface BaseMapperX extends BaseMapper { return selectCount(new QueryWrapper()); } - default Integer selectCount(String field, Object value) { - return selectCount(new QueryWrapper().eq(field, value)).intValue(); + default Long selectCount(String field, Object value) { + return selectCount(new QueryWrapper().eq(field, value)); } - default Integer selectCount(SFunction field, Object value) { - return selectCount(new LambdaQueryWrapper().eq(field, value)).intValue(); + default Long selectCount(SFunction field, Object value) { + return selectCount(new LambdaQueryWrapper().eq(field, value)); } default List selectList() { diff --git a/yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileMapper.java b/yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileMapper.java index 37178a15e9afabcaa09a0844a556df43b44107d3..1786d130f6424e0ea1c2e24755f996b08a4165d7 100644 --- a/yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileMapper.java +++ b/yudao-module-infra/yudao-module-infra-impl/src/main/java/cn/iocoder/yudao/module/infra/dal/mysql/file/FileMapper.java @@ -23,7 +23,7 @@ public interface FileMapper extends BaseMapperX { .orderByDesc("create_time")); } - default Integer selectCountById(String id) { + default Long selectCountById(String id) { return selectCount(FileDO::getId, id); } diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java index f2a353a0357bbaba8999889dd971695f071a42cc..56f6bdf4d63cf4f03f330665a5b3c8c82e0e5e83 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java @@ -24,7 +24,7 @@ public interface DeptMapper extends BaseMapperX { .eq(DeptDO::getName, name)); } - default Integer selectCountByParentId(Long parentId) { + default Long selectCountByParentId(Long parentId) { return selectCount(DeptDO::getParentId, parentId); } diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java index 28e4e468d4e4ea6940142ecd96b333bd9b5fef47..a00dc791a6a75fbce7f1e796dc8106df1226cf82 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dict/DictDataMapper.java @@ -28,7 +28,7 @@ public interface DictDataMapper extends BaseMapperX { .in(DictDataDO::getValue, values)); } - default int selectCountByDictType(String dictType) { + default long selectCountByDictType(String dictType) { return selectCount(DictDataDO::getDictType, dictType); } diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/MenuMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/MenuMapper.java index 9239ef9f5592006533e34fba023f27cba1a10951..fc2718122ea9272cce57b7f4d48d894b4ac24b46 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/MenuMapper.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/permission/MenuMapper.java @@ -19,7 +19,7 @@ public interface MenuMapper extends BaseMapperX { .eq(MenuDO::getName, name)); } - default Integer selectCountByParentId(Long parentId) { + default Long selectCountByParentId(Long parentId) { return selectCount(MenuDO::getParentId, parentId); } diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsTemplateMapper.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsTemplateMapper.java index 84d335e4f6dc31d537582584ebbe19dd006f3938..32a2c38176a74eae202c530a9d0c8b2c9477031a 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsTemplateMapper.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/sms/SmsTemplateMapper.java @@ -46,7 +46,7 @@ public interface SmsTemplateMapper extends BaseMapperX { .orderByDesc(SmsTemplateDO::getId)); } - default Integer selectCountByChannelId(Long channelId) { + default Long selectCountByChannelId(Long channelId) { return selectCount(SmsTemplateDO::getChannelId, channelId); } diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java index 0742f82931f53be68235c2ce106d6a067240e03a..db1a1b624cb7921f7e293dd774d12e45bf1ddb2b 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataService.java @@ -82,7 +82,7 @@ public interface DictDataService extends DictDataFrameworkService { * @param dictType 字典类型 * @return 数据数量 */ - int countByDictType(String dictType); + long countByDictType(String dictType); /** * 校验字典数据们是否有效。如下情况,视为无效: diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java index f80fe6503bf8ab1dbf59ccebd23f18ebea8ac541..abbd2db21dfd7d0beee3310aff7c2ab03a69bd6b 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictDataServiceImpl.java @@ -208,7 +208,7 @@ public class DictDataServiceImpl implements DictDataService { } @Override - public int countByDictType(String dictType) { + public long countByDictType(String dictType) { return dictDataMapper.selectCountByDictType(dictType); } diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java index cc3fa5e6688aa26e88a36b08a2e9bfa2cfcc62fd..78b204d5c1fd7a95400520634511e5302c75a4a3 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java @@ -167,6 +167,7 @@ public class MenuServiceImpl implements MenuService { * @param menuId 菜单编号 */ @Transactional(rollbackFor = Exception.class) + @Override public void deleteMenu(Long menuId) { // 校验是否还有子菜单 if (menuMapper.selectCountByParentId(menuId) > 0) { diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java index eaa655066530fabf25fb8b97bc561010eae50f63..997586c7385d00907e5298d5cd2bed28e93ba1dc 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java @@ -110,6 +110,6 @@ public interface SmsTemplateService { * @param channelId 短信渠道编号 * @return 数量 */ - Integer countByChannelId(Long channelId); + Long countByChannelId(Long channelId); } diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java index a829b3408e033d320ba3a6cf072c13143c002006..281a314e7b5bd7d18b027c2ab576e894443b7199 100644 --- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java +++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java @@ -216,7 +216,7 @@ public class SmsTemplateServiceImpl implements SmsTemplateService { } @Override - public Integer countByChannelId(Long channelId) { + public Long countByChannelId(Long channelId) { return smsTemplateMapper.selectCountByChannelId(channelId); } diff --git a/yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceTest.java b/yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceTest.java index 406f1e8a440428910b40fb604ee50ef7ce6f3633..0c5045258817fc5f8db52a17a665e82b00d19048 100644 --- a/yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceTest.java +++ b/yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceTest.java @@ -177,7 +177,7 @@ public class DictTypeServiceTest extends BaseDbUnitTest { // 准备参数 Long id = dbDictType.getId(); // mock 方法 - when(dictDataService.countByDictType(eq(dbDictType.getType()))).thenReturn(1); + when(dictDataService.countByDictType(eq(dbDictType.getType()))).thenReturn(1L); // 调用, 并断言异常 assertServiceException(() -> dictTypeService.deleteDictType(id), DICT_TYPE_HAS_CHILDREN); diff --git a/yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java b/yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java index 7e8b8445ede5faf5293e1d574d642d7d3ffbef20..8ff9683a695d40b7317f9aedfe45ae396cd28e40 100644 --- a/yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java +++ b/yudao-module-system/yudao-module-system-impl/src/test/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelServiceTest.java @@ -147,7 +147,7 @@ public class SmsChannelServiceTest extends BaseDbUnitTest { // 准备参数 Long id = dbSmsChannel.getId(); // mock 方法 - when(smsTemplateService.countByChannelId(eq(id))).thenReturn(10); + when(smsTemplateService.countByChannelId(eq(id))).thenReturn(10L); // 调用, 并断言异常 assertServiceException(() -> smsChannelService.deleteSmsChannel(id), SMS_CHANNEL_HAS_CHILDREN);