From f2b59f04ad7cf0c37877ab97e7ad2ceed3dc77ec Mon Sep 17 00:00:00 2001 From: yewei <17855368071@163.com> Date: Wed, 28 Sep 2022 13:54:18 +0800 Subject: [PATCH] finish modify application query detail --- .../biz/ConfigModificationQueryService.java | 8 ++++++++ .../impl/ConfigModificationQueryServiceImpl.java | 14 +++++++++++--- .../console/controller/ConfigVerifyController.java | 11 +++++++---- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationQueryService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationQueryService.java index c46a4d13..b34401c8 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationQueryService.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationQueryService.java @@ -17,6 +17,7 @@ package cn.hippo4j.config.service.biz; +import cn.hippo4j.common.model.ThreadPoolParameterInfo; import cn.hippo4j.config.model.biz.threadpool.ConfigModificationQueryRespDTO; import cn.hippo4j.config.model.biz.threadpool.ThreadPoolQueryReqDTO; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -32,4 +33,11 @@ public interface ConfigModificationQueryService { * @return */ IPage queryApplicationPage(ThreadPoolQueryReqDTO reqDTO); + + /** + * query config modification detail by application id + * @param id + * @return + */ + ThreadPoolParameterInfo queryApplicationDetail(Long id); } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigModificationQueryServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigModificationQueryServiceImpl.java index e9c8023c..ffb5fbda 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigModificationQueryServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigModificationQueryServiceImpl.java @@ -17,13 +17,12 @@ package cn.hippo4j.config.service.biz.impl; -import cn.hippo4j.common.enums.DelEnum; +import cn.hippo4j.common.model.ThreadPoolParameterInfo; +import cn.hippo4j.common.toolkit.JSONUtil; import cn.hippo4j.config.mapper.HisConfigVerifyMapper; -import cn.hippo4j.config.model.ConfigAllInfo; import cn.hippo4j.config.model.HisConfigVerifyInfo; import cn.hippo4j.config.model.biz.threadpool.ConfigModificationQueryRespDTO; import cn.hippo4j.config.model.biz.threadpool.ThreadPoolQueryReqDTO; -import cn.hippo4j.config.model.biz.threadpool.ThreadPoolRespDTO; import cn.hippo4j.config.service.biz.ConfigModificationQueryService; import cn.hippo4j.config.toolkit.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -48,4 +47,13 @@ public class ConfigModificationQueryServiceImpl implements ConfigModificationQue .orderByDesc(HisConfigVerifyInfo::getGmtCreate); return hisConfigVerifyMapper.selectPage(reqDTO, wrapper).convert(each -> BeanUtil.convert(each, ConfigModificationQueryRespDTO.class)); } + + @Override + public ThreadPoolParameterInfo queryApplicationDetail(Long id) { + HisConfigVerifyInfo hisConfigVerifyInfo = hisConfigVerifyMapper.selectById(id); + ThreadPoolParameterInfo poolParameterInfo = JSONUtil.parseObject(hisConfigVerifyInfo.getContent(), ThreadPoolParameterInfo.class); + poolParameterInfo.setCorePoolSize(poolParameterInfo.corePoolSizeAdapt()); + poolParameterInfo.setMaximumPoolSize(poolParameterInfo.maximumPoolSizeAdapt()); + return poolParameterInfo; + } } diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ConfigVerifyController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ConfigVerifyController.java index 7a927a10..df376855 100644 --- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ConfigVerifyController.java +++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ConfigVerifyController.java @@ -18,6 +18,7 @@ package cn.hippo4j.console.controller; import cn.hippo4j.common.constant.Constants; +import cn.hippo4j.common.model.ThreadPoolParameterInfo; import cn.hippo4j.common.toolkit.ConditionUtil; import cn.hippo4j.common.web.base.Result; import cn.hippo4j.common.web.base.Results; @@ -29,10 +30,7 @@ import cn.hippo4j.config.service.biz.ConfigModificationVerifyService; import cn.hippo4j.config.verify.ConfigModificationVerifyServiceChoose; import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @RestController @AllArgsConstructor @@ -58,4 +56,9 @@ public class ConfigVerifyController { return Results.success(queryService.queryApplicationPage(reqDTO)); } + @GetMapping("/query/application/detail") + public Result modificationApplicationDetail(@RequestParam("id") Long id) { + return Results.success(queryService.queryApplicationDetail(id)); + } + }