diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java index 6193fe98..d48c9fdc 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java @@ -220,7 +220,7 @@ public class BizOrgServiceImpl extends ServiceImpl impleme throw new CommonException("请先删除机构下的岗位"); } // 执行删除 - this.removeBatchByIds(toDeleteOrgIdList); + this.removeByIds(toDeleteOrgIdList); } } diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/impl/BizPositionServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/impl/BizPositionServiceImpl.java index 029cb815..c25d9910 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/impl/BizPositionServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/impl/BizPositionServiceImpl.java @@ -175,7 +175,7 @@ public class BizPositionServiceImpl extends ServiceImpl impl .set(BizUser::getPositionJson, JSONUtil.toJsonStr(handledJsonObjectList))); }); // 执行删除 - this.removeBatchByIds(bizUserIdList); + this.removeByIds(bizUserIdList); // TODO 此处需要将这些人员踢下线,并永久注销这些人员 } diff --git a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java index 3813c217..a31a004b 100644 --- a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/service/impl/ClientUserServiceImpl.java @@ -201,7 +201,7 @@ public class ClientUserServiceImpl extends ServiceImpl clientUserIdParamList) { - this.removeBatchByIds(CollStreamUtil.toList(clientUserIdParamList, ClientUserIdParam::getId)); + this.removeByIds(CollStreamUtil.toList(clientUserIdParamList, ClientUserIdParam::getId)); } @Override diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/config/service/impl/DevConfigServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/config/service/impl/DevConfigServiceImpl.java index b42a6fa5..47e49071 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/config/service/impl/DevConfigServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/config/service/impl/DevConfigServiceImpl.java @@ -154,7 +154,7 @@ public class DevConfigServiceImpl extends ServiceImpl impl throw new CommonException("不可删除系统内置字典"); } // 删除 - this.removeBatchByIds(devDictIdList); + this.removeByIds(devDictIdList); } } diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/email/service/impl/DevEmailServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/email/service/impl/DevEmailServiceImpl.java index c502f466..fbc1805f 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/email/service/impl/DevEmailServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/email/service/impl/DevEmailServiceImpl.java @@ -182,7 +182,7 @@ public class DevEmailServiceImpl extends ServiceImpl i @Override public void delete(List devEmailIdParamList) { - this.removeBatchByIds(CollStreamUtil.toList(devEmailIdParamList, DevEmailIdParam::getId)); + this.removeByIds(CollStreamUtil.toList(devEmailIdParamList, DevEmailIdParam::getId)); } @Override diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/file/service/impl/DevFileServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/file/service/impl/DevFileServiceImpl.java index 0f19393e..cf949ba4 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/file/service/impl/DevFileServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/file/service/impl/DevFileServiceImpl.java @@ -114,7 +114,7 @@ public class DevFileServiceImpl extends ServiceImpl impl @Override public void delete(List devFileIdParamList) { - this.removeBatchByIds(CollStreamUtil.toList(devFileIdParamList, DevFileIdParam::getId)); + this.removeByIds(CollStreamUtil.toList(devFileIdParamList, DevFileIdParam::getId)); } /** diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/job/service/impl/DevJobServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/job/service/impl/DevJobServiceImpl.java index 1bc0af3b..d16e0604 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/job/service/impl/DevJobServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/job/service/impl/DevJobServiceImpl.java @@ -169,7 +169,7 @@ public class DevJobServiceImpl extends ServiceImpl impleme // 将运行中的停止 devJobIdList.forEach(CronUtil::remove); // 执行删除 - this.removeBatchByIds(devJobIdList); + this.removeByIds(devJobIdList); } } diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/service/impl/DevLogServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/service/impl/DevLogServiceImpl.java index bc31e1b6..f4999a26 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/service/impl/DevLogServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/service/impl/DevLogServiceImpl.java @@ -13,6 +13,7 @@ package vip.xiaonuo.dev.modular.log.service.impl; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; @@ -109,14 +110,14 @@ public class DevLogServiceImpl extends ServiceImpl impleme List resultList = CollectionUtil.newArrayList(); DevLogVisPieChartDataResult devLogLoginPieChartDataResult = new DevLogVisPieChartDataResult(); devLogLoginPieChartDataResult.setType("登录"); - devLogLoginPieChartDataResult.setValue(this.count(new LambdaQueryWrapper() - .eq(DevLog::getCategory, DevLogCategoryEnum.LOGIN.getValue()))); + devLogLoginPieChartDataResult.setValue(Convert.toLong(this.count(new LambdaQueryWrapper() + .eq(DevLog::getCategory, DevLogCategoryEnum.LOGIN.getValue())))); resultList.add(devLogLoginPieChartDataResult); DevLogVisPieChartDataResult devLogLogoutPieChartDataResult = new DevLogVisPieChartDataResult(); devLogLogoutPieChartDataResult.setType("登出"); - devLogLogoutPieChartDataResult.setValue(this.count(new LambdaQueryWrapper() - .eq(DevLog::getCategory, DevLogCategoryEnum.LOGOUT.getValue()))); + devLogLogoutPieChartDataResult.setValue(Convert.toLong(this.count(new LambdaQueryWrapper() + .eq(DevLog::getCategory, DevLogCategoryEnum.LOGOUT.getValue())))); resultList.add(devLogLogoutPieChartDataResult); return resultList; } @@ -160,14 +161,14 @@ public class DevLogServiceImpl extends ServiceImpl impleme List resultList = CollectionUtil.newArrayList(); DevLogOpPieChartDataResult devLogOperatePieChartDataResult = new DevLogOpPieChartDataResult(); devLogOperatePieChartDataResult.setType("操作日志"); - devLogOperatePieChartDataResult.setValue(this.count(new LambdaQueryWrapper() - .eq(DevLog::getCategory, DevLogCategoryEnum.OPERATE.getValue()))); + devLogOperatePieChartDataResult.setValue(Convert.toLong(this.count(new LambdaQueryWrapper() + .eq(DevLog::getCategory, DevLogCategoryEnum.OPERATE.getValue())))); resultList.add(devLogOperatePieChartDataResult); DevLogOpPieChartDataResult devLogExceptionPieChartDataResult = new DevLogOpPieChartDataResult(); devLogExceptionPieChartDataResult.setType("异常日志"); - devLogExceptionPieChartDataResult.setValue(this.count(new LambdaQueryWrapper() - .eq(DevLog::getCategory, DevLogCategoryEnum.EXCEPTION.getValue()))); + devLogExceptionPieChartDataResult.setValue(Convert.toLong(this.count(new LambdaQueryWrapper() + .eq(DevLog::getCategory, DevLogCategoryEnum.EXCEPTION.getValue())))); resultList.add(devLogExceptionPieChartDataResult); return resultList; } diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java index 94c3c150..f843e28b 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java @@ -161,7 +161,7 @@ public class DevMessageServiceImpl extends ServiceImpl().eq(DevRelation::getCategory, DevRelationCategoryEnum.MSG_TO_USER.getValue()) .in(DevRelation::getObjectId, devMessageIdList)); // 执行删除 - this.removeBatchByIds(devMessageIdList); + this.removeByIds(devMessageIdList); } } diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/sms/service/impl/DevSmsServiceImpl.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/sms/service/impl/DevSmsServiceImpl.java index 5716f9ce..8db6caa6 100644 --- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/sms/service/impl/DevSmsServiceImpl.java +++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/sms/service/impl/DevSmsServiceImpl.java @@ -92,7 +92,7 @@ public class DevSmsServiceImpl extends ServiceImpl impleme @Override public void delete(List devSmsIdParamList) { - this.removeBatchByIds(CollStreamUtil.toList(devSmsIdParamList, DevSmsIdParam::getId)); + this.removeByIds(CollStreamUtil.toList(devSmsIdParamList, DevSmsIdParam::getId)); } @Override diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/ServiceImpl.java.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/ServiceImpl.java.btl index 3a4aa2c5..c19a402e 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/ServiceImpl.java.btl +++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/ServiceImpl.java.btl @@ -98,7 +98,7 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c // 执行删除 <% for(var i = 0; i < configList.~size; i++) { %> <% if(configList[i].needTableId) { %> - this.removeBatchByIds(CollStreamUtil.toList(${classNameFirstLower}IdParamList, ${className}IdParam::get${configList[i].fieldNameCamelCaseFirstUpper})); + this.removeByIds(CollStreamUtil.toList(${classNameFirstLower}IdParamList, ${className}IdParam::get${configList[i].fieldNameCamelCaseFirstUpper})); <% } %> <% } %> } diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java index e2dfee28..b6a3a627 100644 --- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileButtonServiceImpl.java @@ -114,7 +114,7 @@ public class MobileButtonServiceImpl extends ServiceImpl scheduleIdList = sysIndexScheduleIdParamList.stream().map(SysIndexScheduleIdParam::getId) .collect(Collectors.toList()); if(ObjectUtil.isNotEmpty(scheduleIdList)) { - sysRelationService.removeBatchByIds(scheduleIdList); + sysRelationService.removeByIds(scheduleIdList); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java index 0922675d..cb4116a2 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java @@ -172,7 +172,7 @@ public class SysOrgServiceImpl extends ServiceImpl impleme throw new CommonException("请先删除组织下的职位"); } // 执行删除 - this.removeBatchByIds(toDeleteOrgIdList); + this.removeByIds(toDeleteOrgIdList); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/impl/SysPositionServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/impl/SysPositionServiceImpl.java index 9d112ce9..3401ab48 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/impl/SysPositionServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/impl/SysPositionServiceImpl.java @@ -135,7 +135,7 @@ public class SysPositionServiceImpl extends ServiceImpl impl sysRelationService.remove(new LambdaUpdateWrapper().in(SysRelation::getTargetId, toDeleteMenuIdList) .eq(SysRelation::getCategory, SysRelationCategoryEnum.SYS_ROLE_HAS_RESOURCE.getValue())); // 执行删除 - this.removeBatchByIds(toDeleteMenuIdList); + this.removeByIds(toDeleteMenuIdList); } } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java index 90c5f841..28bba158 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysModuleServiceImpl.java @@ -129,7 +129,7 @@ public class SysModuleServiceImpl extends ServiceImpl().in(SysRelation::getTargetId, toDeleteMenuIdList) .eq(SysRelation::getCategory, SysRelationCategoryEnum.SYS_ROLE_HAS_RESOURCE.getValue())); // 执行删除 - this.removeBatchByIds(toDeleteMenuIdList); + this.removeByIds(toDeleteMenuIdList); } } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysSpaServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysSpaServiceImpl.java index ed65f239..bec49439 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysSpaServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/resource/service/impl/SysSpaServiceImpl.java @@ -143,7 +143,7 @@ public class SysSpaServiceImpl extends ServiceImpl impleme throw new CommonException("不可删除系统内置单页面"); } // 删除 - this.removeBatchByIds(sysSpaIdList); + this.removeByIds(sysSpaIdList); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java index 6826cf18..26cae616 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java @@ -183,7 +183,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl sysRelationService.remove(new LambdaUpdateWrapper().in(SysRelation::getObjectId, sysRoleIdList) .eq(SysRelation::getCategory, SysRelationCategoryEnum.SYS_ROLE_HAS_PERMISSION.getValue())); // 执行删除 - this.removeBatchByIds(sysRoleIdList); + this.removeByIds(sysRoleIdList); } } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index 0655b543..3f0ed6cc 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -321,7 +321,7 @@ public class SysUserServiceImpl extends ServiceImpl impl .set(SysUser::getPositionJson, JSONUtil.toJsonStr(handledJsonObjectList))); }); // 执行删除 - this.removeBatchByIds(sysUserIdList); + this.removeByIds(sysUserIdList); // TODO 此处需要将这些用户踢下线,并永久注销这些用户 }