From 8ab9ecd064af83eec64014e8fb11cc0e8bb6156f Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Thu, 1 Jul 2021 09:26:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8A=9F=E8=83=BD=E6=8C=81=E7=BB=AD?= =?UTF-8?q?=E6=9B=B4=E6=96=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../threadpool/server/ServerApplication.java | 2 +- .../server/controller/ItemController.java | 6 +- .../controller/ThreadPoolController.java | 2 +- .../server/model/biz/item/ItemRespDTO.java | 18 ++++++ .../biz/threadpool/ThreadPoolRespDTO.java | 59 +++++++++++++++++++ .../biz/{impl => }/ConfigServiceImpl.java | 3 +- .../server/service/biz/ItemService.java | 3 +- .../biz/{impl => }/ItemServiceImpl.java | 11 ++-- .../biz/{impl => }/TenantServiceImpl.java | 2 +- .../biz/{impl => }/ThreadPoolServiceImpl.java | 4 +- 10 files changed, 93 insertions(+), 17 deletions(-) rename server/src/main/java/io/dynamic/threadpool/server/service/biz/{impl => }/ConfigServiceImpl.java (95%) rename server/src/main/java/io/dynamic/threadpool/server/service/biz/{impl => }/ItemServiceImpl.java (90%) rename server/src/main/java/io/dynamic/threadpool/server/service/biz/{impl => }/TenantServiceImpl.java (98%) rename server/src/main/java/io/dynamic/threadpool/server/service/biz/{impl => }/ThreadPoolServiceImpl.java (92%) diff --git a/server/src/main/java/io/dynamic/threadpool/server/ServerApplication.java b/server/src/main/java/io/dynamic/threadpool/server/ServerApplication.java index 0d5ef65b..7c1dcb66 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/ServerApplication.java +++ b/server/src/main/java/io/dynamic/threadpool/server/ServerApplication.java @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication( scanBasePackages = { - "io.dynamic.threadpool.common.config", "io.dynamic.threadpool.server" + "io.dynamic.threadpool.server", "io.dynamic.threadpool.common.config" }) @MapperScan("io.dynamic.threadpool.server.mapper") public class ServerApplication { diff --git a/server/src/main/java/io/dynamic/threadpool/server/controller/ItemController.java b/server/src/main/java/io/dynamic/threadpool/server/controller/ItemController.java index daf93e54..3cb332d1 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/controller/ItemController.java +++ b/server/src/main/java/io/dynamic/threadpool/server/controller/ItemController.java @@ -29,9 +29,9 @@ public class ItemController { return Results.success(itemService.queryItemPage(reqDTO)); } - @GetMapping("/item/query/{itemId}") - public Result queryItemById(@PathVariable("itemId") String itemId) { - return Results.success(itemService.queryItemById(itemId)); + @GetMapping("/item/query/{namespace}/{itemId}") + public Result queryItemById(@PathVariable("namespace") String namespace, @PathVariable("itemId") String itemId) { + return Results.success(itemService.queryItemById(namespace, itemId)); } @PostMapping("/item/save") diff --git a/server/src/main/java/io/dynamic/threadpool/server/controller/ThreadPoolController.java b/server/src/main/java/io/dynamic/threadpool/server/controller/ThreadPoolController.java index 8f11e474..7fd3abf8 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/controller/ThreadPoolController.java +++ b/server/src/main/java/io/dynamic/threadpool/server/controller/ThreadPoolController.java @@ -29,7 +29,7 @@ public class ThreadPoolController { return Results.success(threadPoolService.queryThreadPoolPage(reqDTO)); } - @PostMapping("/thread/pool/query}") + @PostMapping("/thread/pool/query") public Result queryNameSpace(@RequestBody ThreadPoolQueryReqDTO reqDTO) { return Results.success(threadPoolService.getThreadPool(reqDTO)); } diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemRespDTO.java b/server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemRespDTO.java index bdf4c5ef..40dfcace 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemRespDTO.java +++ b/server/src/main/java/io/dynamic/threadpool/server/model/biz/item/ItemRespDTO.java @@ -2,6 +2,8 @@ package io.dynamic.threadpool.server.model.biz.item; import lombok.Data; +import java.util.Date; + /** * 项目出参 * @@ -10,4 +12,20 @@ import lombok.Data; */ @Data public class ItemRespDTO { + + private Integer id; + + private String tenantId; + + private String itemId; + + private String itemName; + + private String itemDesc; + + private String owner; + + private Date gmtCreate; + + private Date gmtModified; } diff --git a/server/src/main/java/io/dynamic/threadpool/server/model/biz/threadpool/ThreadPoolRespDTO.java b/server/src/main/java/io/dynamic/threadpool/server/model/biz/threadpool/ThreadPoolRespDTO.java index 647aa306..3dfe8b77 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/model/biz/threadpool/ThreadPoolRespDTO.java +++ b/server/src/main/java/io/dynamic/threadpool/server/model/biz/threadpool/ThreadPoolRespDTO.java @@ -11,4 +11,63 @@ import lombok.Data; @Data public class ThreadPoolRespDTO { + /** + * 命名空间 + */ + private String namespace; + + /** + * 项目 Id + */ + private String itemId; + + /** + * 线程池 Id + */ + private String tpId; + + /** + * 内容 + */ + private String content; + + /** + * 核心线程数 + */ + private Integer coreSize; + + /** + * 最大线程数 + */ + private Integer maxSize; + + /** + * 队列类型 + */ + private Integer queueType; + + /** + * 队列长度 + */ + private Integer capacity; + + /** + * 线程存活时长 + */ + private Integer keepAliveTime; + + /** + * 是否告警 + */ + private Integer isAlarm; + + /** + * 容量告警 + */ + private Integer capacityAlarm; + + /** + * 活跃度告警 + */ + private Integer livenessAlarm; } diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/biz/impl/ConfigServiceImpl.java b/server/src/main/java/io/dynamic/threadpool/server/service/biz/ConfigServiceImpl.java similarity index 95% rename from server/src/main/java/io/dynamic/threadpool/server/service/biz/impl/ConfigServiceImpl.java rename to server/src/main/java/io/dynamic/threadpool/server/service/biz/ConfigServiceImpl.java index 0b55caaa..1bae0c6f 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/biz/impl/ConfigServiceImpl.java +++ b/server/src/main/java/io/dynamic/threadpool/server/service/biz/ConfigServiceImpl.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.service.biz.impl; +package io.dynamic.threadpool.server.service.biz; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -10,7 +10,6 @@ import io.dynamic.threadpool.server.event.LocalDataChangeEvent; import io.dynamic.threadpool.server.mapper.ConfigInfoMapper; import io.dynamic.threadpool.server.model.ConfigAllInfo; import io.dynamic.threadpool.server.service.ConfigChangePublisher; -import io.dynamic.threadpool.server.service.biz.ConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ItemService.java b/server/src/main/java/io/dynamic/threadpool/server/service/biz/ItemService.java index 9f300b29..7a0c82b3 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/biz/ItemService.java +++ b/server/src/main/java/io/dynamic/threadpool/server/service/biz/ItemService.java @@ -27,10 +27,11 @@ public interface ItemService { /** * 根据 Id 获取项目 * + * @param namespace * @param itemId * @return */ - ItemRespDTO queryItemById(String itemId); + ItemRespDTO queryItemById(String namespace, String itemId); /** * 查询项目 diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/biz/impl/ItemServiceImpl.java b/server/src/main/java/io/dynamic/threadpool/server/service/biz/ItemServiceImpl.java similarity index 90% rename from server/src/main/java/io/dynamic/threadpool/server/service/biz/impl/ItemServiceImpl.java rename to server/src/main/java/io/dynamic/threadpool/server/service/biz/ItemServiceImpl.java index e8240641..bd723380 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/biz/impl/ItemServiceImpl.java +++ b/server/src/main/java/io/dynamic/threadpool/server/service/biz/ItemServiceImpl.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.service.biz.impl; +package io.dynamic.threadpool.server.service.biz; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -11,7 +11,6 @@ import io.dynamic.threadpool.server.model.biz.item.ItemQueryReqDTO; import io.dynamic.threadpool.server.model.biz.item.ItemRespDTO; import io.dynamic.threadpool.server.model.biz.item.ItemSaveReqDTO; import io.dynamic.threadpool.server.model.biz.item.ItemUpdateReqDTO; -import io.dynamic.threadpool.server.service.biz.ItemService; import io.dynamic.threadpool.server.toolkit.BeanUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -38,15 +37,17 @@ public class ItemServiceImpl implements ItemService { .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()); - Page resultPage = itemInfoMapper.selectPage(reqDTO, wrapper); + Page resultPage = itemInfoMapper.selectPage(reqDTO, wrapper); return resultPage.convert(each -> BeanUtil.convert(each, ItemRespDTO.class)); } @Override - public ItemRespDTO queryItemById(String itemId) { + public ItemRespDTO queryItemById(String namespace, String itemId) { LambdaQueryWrapper queryWrapper = Wrappers - .lambdaQuery(ItemInfo.class).eq(ItemInfo::getItemId, itemId); + .lambdaQuery(ItemInfo.class) + .eq(ItemInfo::getTenantId, namespace) + .eq(ItemInfo::getItemId, itemId); ItemInfo itemInfo = itemInfoMapper.selectOne(queryWrapper); ItemRespDTO result = BeanUtil.convert(itemInfo, ItemRespDTO.class); diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/biz/impl/TenantServiceImpl.java b/server/src/main/java/io/dynamic/threadpool/server/service/biz/TenantServiceImpl.java similarity index 98% rename from server/src/main/java/io/dynamic/threadpool/server/service/biz/impl/TenantServiceImpl.java rename to server/src/main/java/io/dynamic/threadpool/server/service/biz/TenantServiceImpl.java index 93aac3d3..d71626be 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/biz/impl/TenantServiceImpl.java +++ b/server/src/main/java/io/dynamic/threadpool/server/service/biz/TenantServiceImpl.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.service.biz.impl; +package io.dynamic.threadpool.server.service.biz; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/server/src/main/java/io/dynamic/threadpool/server/service/biz/impl/ThreadPoolServiceImpl.java b/server/src/main/java/io/dynamic/threadpool/server/service/biz/ThreadPoolServiceImpl.java similarity index 92% rename from server/src/main/java/io/dynamic/threadpool/server/service/biz/impl/ThreadPoolServiceImpl.java rename to server/src/main/java/io/dynamic/threadpool/server/service/biz/ThreadPoolServiceImpl.java index 3e36513e..696697fb 100644 --- a/server/src/main/java/io/dynamic/threadpool/server/service/biz/impl/ThreadPoolServiceImpl.java +++ b/server/src/main/java/io/dynamic/threadpool/server/service/biz/ThreadPoolServiceImpl.java @@ -1,4 +1,4 @@ -package io.dynamic.threadpool.server.service.biz.impl; +package io.dynamic.threadpool.server.service.biz; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -9,8 +9,6 @@ import io.dynamic.threadpool.server.model.ConfigAllInfo; import io.dynamic.threadpool.server.model.biz.threadpool.ThreadPoolQueryReqDTO; import io.dynamic.threadpool.server.model.biz.threadpool.ThreadPoolRespDTO; import io.dynamic.threadpool.server.model.biz.threadpool.ThreadPoolSaveOrUpdateReqDTO; -import io.dynamic.threadpool.server.service.biz.ConfigService; -import io.dynamic.threadpool.server.service.biz.ThreadPoolService; import io.dynamic.threadpool.server.toolkit.BeanUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service;