diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemQueryReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemQueryReqDTO.java index 550dc122..46de7a22 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemQueryReqDTO.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/item/ItemQueryReqDTO.java @@ -30,23 +30,27 @@ import lombok.Data; public class ItemQueryReqDTO extends Page { /** - * tenantId + * Tenant id */ private String tenantId; /** - * itemId + * Item id */ private String itemId; /** - * itemName + * Item name */ private String itemName; /** - * owner + * Owner */ private String owner; + /** + * Desc + */ + private Boolean desc; } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantQueryReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantQueryReqDTO.java index 126cd9b5..bfe09832 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantQueryReqDTO.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/tenant/TenantQueryReqDTO.java @@ -30,18 +30,22 @@ import lombok.Data; public class TenantQueryReqDTO extends Page { /** - * tenantId + * Tenant id */ private String tenantId; /** - * tenantName + * Tenant name */ private String tenantName; /** - * owner + * Owner */ private String owner; + /** + * Desc + */ + private Boolean desc; } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ItemServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ItemServiceImpl.java index 5bc0b0a8..d3bb4e18 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ItemServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ItemServiceImpl.java @@ -61,8 +61,8 @@ public class ItemServiceImpl implements ItemService { .eq(!StringUtils.isEmpty(reqDTO.getItemId()), ItemInfo::getItemId, reqDTO.getItemId()) .eq(!StringUtils.isEmpty(reqDTO.getItemName()), ItemInfo::getItemName, reqDTO.getItemName()) .eq(!StringUtils.isEmpty(reqDTO.getTenantId()), ItemInfo::getTenantId, reqDTO.getTenantId()) - .eq(!StringUtils.isEmpty(reqDTO.getOwner()), ItemInfo::getOwner, reqDTO.getOwner()); - + .eq(!StringUtils.isEmpty(reqDTO.getOwner()), ItemInfo::getOwner, reqDTO.getOwner()) + .orderByDesc(reqDTO.getDesc() != null, ItemInfo::getGmtCreate); Page resultPage = itemInfoMapper.selectPage(reqDTO, wrapper); return resultPage.convert(each -> BeanUtil.convert(each, ItemRespDTO.class)); } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/TenantServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/TenantServiceImpl.java index 04238bc0..6a9501f3 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/TenantServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/TenantServiceImpl.java @@ -66,7 +66,6 @@ public class TenantServiceImpl implements TenantService { public TenantRespDTO getTenantByTenantId(String tenantId) { LambdaQueryWrapper queryWrapper = Wrappers .lambdaQuery(TenantInfo.class).eq(TenantInfo::getTenantId, tenantId); - TenantInfo tenantInfo = tenantInfoMapper.selectOne(queryWrapper); TenantRespDTO result = BeanUtil.convert(tenantInfo, TenantRespDTO.class); return result; @@ -77,8 +76,8 @@ public class TenantServiceImpl implements TenantService { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(TenantInfo.class) .eq(!StringUtils.isEmpty(reqDTO.getTenantId()), TenantInfo::getTenantId, reqDTO.getTenantId()) .eq(!StringUtils.isEmpty(reqDTO.getTenantName()), TenantInfo::getTenantName, reqDTO.getTenantName()) - .eq(!StringUtils.isEmpty(reqDTO.getOwner()), TenantInfo::getOwner, reqDTO.getOwner()); - + .eq(!StringUtils.isEmpty(reqDTO.getOwner()), TenantInfo::getOwner, reqDTO.getOwner()) + .orderByDesc(reqDTO.getDesc() != null, TenantInfo::getGmtCreate); Page resultPage = tenantInfoMapper.selectPage(reqDTO, wrapper); return resultPage.convert(each -> BeanUtil.convert(each, TenantRespDTO.class)); } @@ -87,8 +86,7 @@ public class TenantServiceImpl implements TenantService { public void saveTenant(TenantSaveReqDTO reqDTO) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(TenantInfo.class) .eq(TenantInfo::getTenantId, reqDTO.getTenantId()); - - // 当前为单体应用, 后续支持集群部署时切换分布式锁. + // Currently it is a single application, and it supports switching distributed locks during cluster deployment in the future. synchronized (TenantService.class) { TenantInfo existTenantInfo = tenantInfoMapper.selectOne(queryWrapper); Assert.isNull(existTenantInfo, "租户配置已存在."); @@ -109,7 +107,6 @@ public class TenantServiceImpl implements TenantService { TenantInfo tenantInfo = BeanUtil.convert(reqDTO, TenantInfo.class); int updateResult = tenantInfoMapper.update(tenantInfo, Wrappers .lambdaUpdate(TenantInfo.class).eq(TenantInfo::getTenantId, reqDTO.getTenantId())); - boolean retBool = SqlHelper.retBool(updateResult); if (!retBool) { throw new RuntimeException("Update Error."); @@ -124,7 +121,6 @@ public class TenantServiceImpl implements TenantService { if (CollectionUtils.isNotEmpty(itemList)) { throw new RuntimeException("租户包含项目引用, 删除失败."); } - int updateResult = tenantInfoMapper.update(new TenantInfo(), Wrappers.lambdaUpdate(TenantInfo.class) .eq(TenantInfo::getTenantId, tenantId)