diff --git a/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantUpdateReqDTO.java b/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantUpdateReqDTO.java index 265b0108..9dfc57ec 100644 --- a/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantUpdateReqDTO.java +++ b/config/src/main/java/com/github/dynamic/threadpool/config/model/biz/tenant/TenantUpdateReqDTO.java @@ -11,6 +11,11 @@ import lombok.Data; @Data public class TenantUpdateReqDTO { + /** + * id + */ + private Long id; + /** * tenantId */ diff --git a/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/TenantService.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/TenantService.java index 23ee1bfb..6dfcfa24 100644 --- a/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/TenantService.java +++ b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/TenantService.java @@ -17,10 +17,18 @@ public interface TenantService { /** * Get tenant by id. * - * @param tenantIdId + * @param id * @return */ - TenantRespDTO getTenantById(String tenantIdId); + TenantRespDTO getTenantById(String id); + + /** + * Get tenant by tenantId. + * + * @param tenantId + * @return + */ + TenantRespDTO getTenantByTenantId(String tenantId); /** * Query tenant page. diff --git a/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ConfigServiceImpl.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/impl/ConfigServiceImpl.java similarity index 95% rename from config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ConfigServiceImpl.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/biz/impl/ConfigServiceImpl.java index 84343a0e..3812493e 100644 --- a/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ConfigServiceImpl.java +++ b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/impl/ConfigServiceImpl.java @@ -1,4 +1,4 @@ -package com.github.dynamic.threadpool.config.service.biz; +package com.github.dynamic.threadpool.config.service.biz.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -11,6 +11,7 @@ import com.github.dynamic.threadpool.config.event.LocalDataChangeEvent; import com.github.dynamic.threadpool.config.mapper.ConfigInfoMapper; import com.github.dynamic.threadpool.config.model.ConfigAllInfo; import com.github.dynamic.threadpool.config.service.ConfigChangePublisher; +import com.github.dynamic.threadpool.config.service.biz.ConfigService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ItemServiceImpl.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/impl/ItemServiceImpl.java similarity index 90% rename from config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ItemServiceImpl.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/biz/impl/ItemServiceImpl.java index 62d00995..cc7e03d8 100644 --- a/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ItemServiceImpl.java +++ b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/impl/ItemServiceImpl.java @@ -1,4 +1,4 @@ -package com.github.dynamic.threadpool.config.service.biz; +package com.github.dynamic.threadpool.config.service.biz.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -14,6 +14,8 @@ import com.github.dynamic.threadpool.config.model.biz.item.ItemRespDTO; import com.github.dynamic.threadpool.config.model.biz.item.ItemSaveReqDTO; import com.github.dynamic.threadpool.config.model.biz.item.ItemUpdateReqDTO; import com.github.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolRespDTO; +import com.github.dynamic.threadpool.config.service.biz.ItemService; +import com.github.dynamic.threadpool.config.service.biz.ThreadPoolService; import com.github.dynamic.threadpool.config.toolkit.BeanUtil; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; @@ -83,10 +85,10 @@ public class ItemServiceImpl implements ItemService { @Override public void updateItem(ItemUpdateReqDTO reqDTO) { ItemInfo itemInfo = BeanUtil.convert(reqDTO, ItemInfo.class); - int updateResult = itemInfoMapper.update(itemInfo, Wrappers - .lambdaUpdate(ItemInfo.class) - .eq(ItemInfo::getTenantId, reqDTO.getTenantId()) - .eq(ItemInfo::getItemId, reqDTO.getItemId())); + int updateResult = itemInfoMapper.update(itemInfo, + Wrappers.lambdaUpdate(ItemInfo.class) + .eq(ItemInfo::getTenantId, reqDTO.getTenantId()) + .eq(ItemInfo::getItemId, reqDTO.getItemId())); boolean retBool = SqlHelper.retBool(updateResult); if (!retBool) { diff --git a/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ThreadPoolServiceImpl.java b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/impl/ThreadPoolServiceImpl.java similarity index 92% rename from config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ThreadPoolServiceImpl.java rename to config/src/main/java/com/github/dynamic/threadpool/config/service/biz/impl/ThreadPoolServiceImpl.java index 314cc111..95e2d940 100644 --- a/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/ThreadPoolServiceImpl.java +++ b/config/src/main/java/com/github/dynamic/threadpool/config/service/biz/impl/ThreadPoolServiceImpl.java @@ -1,4 +1,4 @@ -package com.github.dynamic.threadpool.config.service.biz; +package com.github.dynamic.threadpool.config.service.biz.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -9,6 +9,8 @@ import com.github.dynamic.threadpool.config.model.ConfigAllInfo; import com.github.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolQueryReqDTO; import com.github.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolRespDTO; import com.github.dynamic.threadpool.config.model.biz.threadpool.ThreadPoolSaveOrUpdateReqDTO; +import com.github.dynamic.threadpool.config.service.biz.ConfigService; +import com.github.dynamic.threadpool.config.service.biz.ThreadPoolService; import com.github.dynamic.threadpool.config.toolkit.BeanUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/console/src/main/java/com/github/dynamic/threadpool/console/controller/TenantController.java b/console/src/main/java/com/github/dynamic/threadpool/console/controller/TenantController.java index 122e7509..bfcf526f 100644 --- a/console/src/main/java/com/github/dynamic/threadpool/console/controller/TenantController.java +++ b/console/src/main/java/com/github/dynamic/threadpool/console/controller/TenantController.java @@ -32,7 +32,7 @@ public class TenantController { @GetMapping("/query/{tenantId}") public Result queryNameSpace(@PathVariable("tenantId") String tenantId) { - return Results.success(tenantService.getTenantById(tenantId)); + return Results.success(tenantService.getTenantByTenantId(tenantId)); } @PostMapping("/save") diff --git a/server/src/main/resources/application.yaml b/server/src/main/resources/application.yaml index 544339f5..fd2561ee 100644 --- a/server/src/main/resources/application.yaml +++ b/server/src/main/resources/application.yaml @@ -1,6 +1,8 @@ server: port: 6691 +tenant: hippo + spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver