feat: 功能持续更新.

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 {

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")

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<ThreadPoolRespDTO> queryNameSpace(@RequestBody ThreadPoolQueryReqDTO reqDTO) {
         return Results.success(threadPoolService.getThreadPool(reqDTO));
     }

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;
 }

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;
 }

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;
 

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);
 
     /**
      * 查询项目

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<ItemInfo> 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<ItemInfo> 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);

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;

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;