From 3720616b53142f62ff742212769b7214fc5e3791 Mon Sep 17 00:00:00 2001 From: yewei <17855368071@163.com> Date: Mon, 26 Sep 2022 15:38:47 +0800 Subject: [PATCH] finish modify application query page --- .../config/controller/ConfigController.java | 7 +- .../ConfigModificationQueryRespDTO.java | 84 +++++++++++++++++++ .../biz/ConfigModificationQueryService.java | 35 ++++++++ ...a => ConfigModificationVerifyService.java} | 4 +- ...tractConfigModificationVerifyService.java} | 4 +- ...lConfigModificationVerifyServiceImpl.java} | 3 +- .../ConfigModificationQueryServiceImpl.java | 51 +++++++++++ ...eConfigModificationVerifyServiceImpl.java} | 2 +- ...eConfigModificationVerifyServiceImpl.java} | 3 +- .../biz/impl/ThreadPoolServiceImpl.java | 7 +- ...lConfigModificationVerifyServiceImpl.java} | 2 +- ...onfigModificationVerifyServiceChoose.java} | 14 ++-- .../controller/ConfigVerifyController.java | 19 ++++- .../ThreadPoolAdapterController.java | 6 +- .../controller/ThreadPoolController.java | 6 +- 15 files changed, 212 insertions(+), 35 deletions(-) create mode 100644 hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModificationQueryRespDTO.java create mode 100644 hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationQueryService.java rename hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/{ConfigModifyVerifyService.java => ConfigModificationVerifyService.java} (94%) rename hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/{AbstractConfigModifyVerifyService.java => AbstractConfigModificationVerifyService.java} (96%) rename hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/{AdapterThreadPoolConfigModifyVerifyServiceImpl.java => AdapterThreadPoolConfigModificationVerifyServiceImpl.java} (91%) create mode 100644 hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigModificationQueryServiceImpl.java rename hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/{ThreadPoolInstanceConfigModifyVerifyServiceImpl.java => ThreadPoolInstanceConfigModificationVerifyServiceImpl.java} (93%) rename hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/{ThreadPoolManageConfigModifyVerifyServiceImpl.java => ThreadPoolManageConfigModificationVerifyServiceImpl.java} (92%) rename hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/{WebThreadPoolConfigModifyVerifyServiceImpl.java => WebThreadPoolConfigModificationVerifyServiceImpl.java} (93%) rename hippo4j-config/src/main/java/cn/hippo4j/config/verify/{ConfigModifyVerifyServiceChoose.java => ConfigModificationVerifyServiceChoose.java} (75%) diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/controller/ConfigController.java b/hippo4j-config/src/main/java/cn/hippo4j/config/controller/ConfigController.java index 4b4ce318..65a7aafd 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/controller/ConfigController.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/controller/ConfigController.java @@ -19,7 +19,6 @@ package cn.hippo4j.config.controller; import cn.hippo4j.common.constant.ConfigModifyTypeConstants; import cn.hippo4j.common.constant.Constants; -import cn.hippo4j.common.enums.EnableEnum; import cn.hippo4j.common.model.register.DynamicThreadPoolRegisterWrapper; import cn.hippo4j.common.toolkit.StringUtil; import cn.hippo4j.common.toolkit.UserContext; @@ -33,7 +32,7 @@ import cn.hippo4j.config.service.ConfigServletInner; import cn.hippo4j.config.service.biz.ConfigService; import cn.hippo4j.config.toolkit.BeanUtil; import cn.hippo4j.config.toolkit.Md5ConfigUtil; -import cn.hippo4j.config.verify.ConfigModifyVerifyServiceChoose; +import cn.hippo4j.config.verify.ConfigModificationVerifyServiceChoose; import cn.hutool.core.util.StrUtil; import lombok.AllArgsConstructor; import lombok.SneakyThrows; @@ -57,7 +56,7 @@ public class ConfigController { private final ConfigServletInner configServletInner; - private final ConfigModifyVerifyServiceChoose configModifyVerifyServiceChoose; + private final ConfigModificationVerifyServiceChoose configModificationVerifyServiceChoose; @GetMapping public Result detailConfigInfo(@RequestParam("tpId") String tpId, @@ -81,7 +80,7 @@ public class ConfigController { modifySaveReqDTO.setModifyAll(StringUtil.isEmpty(identify) ? true : false); modifySaveReqDTO.setIdentify(identify); modifySaveReqDTO.setType(ConfigModifyTypeConstants.THREAD_POOL_INSTANCE); - configModifyVerifyServiceChoose.choose(modifySaveReqDTO.getType()).saveConfigModifyApplication(modifySaveReqDTO); + configModificationVerifyServiceChoose.choose(modifySaveReqDTO.getType()).saveConfigModifyApplication(modifySaveReqDTO); } return Results.success(true); } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModificationQueryRespDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModificationQueryRespDTO.java new file mode 100644 index 00000000..25083569 --- /dev/null +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModificationQueryRespDTO.java @@ -0,0 +1,84 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cn.hippo4j.config.model.biz.threadpool; + +import lombok.Data; + +import java.util.Date; + +/** + * config modify query resp + */ +@Data +public class ConfigModificationQueryRespDTO { + + /** + * his_config_verify id + */ + private String id; + + /** + * config modify type + */ + private Integer type; + + /** + * tenant id + */ + private String tenantId; + + /** + * item id + */ + private String itemId; + + /** + * thread pool id + */ + private String tpId; + + /** + * thread pool identify + */ + private String identify; + + /** + * modify user + */ + private String modifyUser; + + /** + * verify status + */ + private Integer verifyStatus; + + /** + * gmt create + */ + private Date gmtCreate; + + /** + * gmt verify + */ + private Date gmtVerify; + + /** + * verify user + */ + private String verifyUser; +} 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 new file mode 100644 index 00000000..c46a4d13 --- /dev/null +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationQueryService.java @@ -0,0 +1,35 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cn.hippo4j.config.service.biz; + +import cn.hippo4j.config.model.biz.threadpool.ConfigModificationQueryRespDTO; +import cn.hippo4j.config.model.biz.threadpool.ThreadPoolQueryReqDTO; +import com.baomidou.mybatisplus.core.metadata.IPage; + +/** + * config modification application query service + */ +public interface ConfigModificationQueryService { + + /** + * query config modification application page + * @param reqDTO + * @return + */ + IPage queryApplicationPage(ThreadPoolQueryReqDTO reqDTO); +} diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModifyVerifyService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationVerifyService.java similarity index 94% rename from hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModifyVerifyService.java rename to hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationVerifyService.java index 352db0d1..aeb6f182 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModifyVerifyService.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationVerifyService.java @@ -21,9 +21,9 @@ import cn.hippo4j.config.model.biz.threadpool.ConfigModifySaveReqDTO; import cn.hippo4j.config.model.biz.threadpool.ConfigModifyVerifyReqDTO; /** - * config change verify service + * config modification verify service */ -public interface ConfigModifyVerifyService { +public interface ConfigModificationVerifyService { /** * get type diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModifyVerifyService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java similarity index 96% rename from hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModifyVerifyService.java rename to hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java index f7e2a5b3..00e89d42 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModifyVerifyService.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java @@ -26,7 +26,7 @@ import cn.hippo4j.config.mapper.HisConfigVerifyMapper; import cn.hippo4j.config.model.HisConfigVerifyInfo; import cn.hippo4j.config.model.biz.threadpool.ConfigModifySaveReqDTO; import cn.hippo4j.config.model.biz.threadpool.ConfigModifyVerifyReqDTO; -import cn.hippo4j.config.service.biz.ConfigModifyVerifyService; +import cn.hippo4j.config.service.biz.ConfigModificationVerifyService; import cn.hippo4j.config.toolkit.BeanUtil; import cn.hippo4j.discovery.core.BaseInstanceRegistry; import cn.hippo4j.discovery.core.Lease; @@ -37,7 +37,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -public abstract class AbstractConfigModifyVerifyService implements ConfigModifyVerifyService { +public abstract class AbstractConfigModificationVerifyService implements ConfigModificationVerifyService { @Resource protected HisConfigVerifyMapper hisConfigVerifyMapper; diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModifyVerifyServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModificationVerifyServiceImpl.java similarity index 91% rename from hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModifyVerifyServiceImpl.java rename to hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModificationVerifyServiceImpl.java index 405a8700..64c84c7c 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModifyVerifyServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AdapterThreadPoolConfigModificationVerifyServiceImpl.java @@ -19,7 +19,6 @@ package cn.hippo4j.config.service.biz.impl; import cn.hippo4j.common.constant.ConfigModifyTypeConstants; import cn.hippo4j.common.toolkit.JSONUtil; -import cn.hippo4j.config.model.biz.adapter.ThreadPoolAdapterReqDTO; import cn.hippo4j.config.model.biz.threadpool.ConfigModifyVerifyReqDTO; import cn.hutool.core.text.StrBuilder; import cn.hutool.http.HttpUtil; @@ -30,7 +29,7 @@ import static cn.hippo4j.common.constant.Constants.HTTP_EXECUTE_TIMEOUT; @Slf4j @Service -public class AdapterThreadPoolConfigModifyVerifyServiceImpl extends AbstractConfigModifyVerifyService { +public class AdapterThreadPoolConfigModificationVerifyServiceImpl extends AbstractConfigModificationVerifyService { @Override public Integer type() { 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 new file mode 100644 index 00000000..e9c8023c --- /dev/null +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ConfigModificationQueryServiceImpl.java @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package cn.hippo4j.config.service.biz.impl; + +import cn.hippo4j.common.enums.DelEnum; +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; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class ConfigModificationQueryServiceImpl implements ConfigModificationQueryService { + + @Resource + private HisConfigVerifyMapper hisConfigVerifyMapper; + + @Override + public IPage queryApplicationPage(ThreadPoolQueryReqDTO reqDTO) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(HisConfigVerifyInfo.class) + .eq(!StringUtils.isBlank(reqDTO.getTenantId()), HisConfigVerifyInfo::getTenantId, reqDTO.getTenantId()) + .eq(!StringUtils.isBlank(reqDTO.getItemId()), HisConfigVerifyInfo::getItemId, reqDTO.getItemId()) + .orderByDesc(HisConfigVerifyInfo::getGmtCreate); + return hisConfigVerifyMapper.selectPage(reqDTO, wrapper).convert(each -> BeanUtil.convert(each, ConfigModificationQueryRespDTO.class)); + } +} diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModifyVerifyServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModificationVerifyServiceImpl.java similarity index 93% rename from hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModifyVerifyServiceImpl.java rename to hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModificationVerifyServiceImpl.java index 38cdb0be..5fe1e595 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModifyVerifyServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolInstanceConfigModificationVerifyServiceImpl.java @@ -29,7 +29,7 @@ import javax.annotation.Resource; @Slf4j @Service -public class ThreadPoolInstanceConfigModifyVerifyServiceImpl extends AbstractConfigModifyVerifyService { +public class ThreadPoolInstanceConfigModificationVerifyServiceImpl extends AbstractConfigModificationVerifyService { @Resource private ConfigService configService; diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolManageConfigModifyVerifyServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolManageConfigModificationVerifyServiceImpl.java similarity index 92% rename from hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolManageConfigModifyVerifyServiceImpl.java rename to hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolManageConfigModificationVerifyServiceImpl.java index 4372dd90..255078be 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolManageConfigModifyVerifyServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolManageConfigModificationVerifyServiceImpl.java @@ -18,7 +18,6 @@ package cn.hippo4j.config.service.biz.impl; import cn.hippo4j.common.constant.ConfigModifyTypeConstants; -import cn.hippo4j.common.model.ThreadPoolParameterInfo; import cn.hippo4j.config.model.biz.threadpool.ConfigModifyVerifyReqDTO; import cn.hippo4j.config.model.biz.threadpool.ThreadPoolSaveOrUpdateReqDTO; import cn.hippo4j.config.service.biz.ThreadPoolService; @@ -30,7 +29,7 @@ import javax.annotation.Resource; @Slf4j @Service -public class ThreadPoolManageConfigModifyVerifyServiceImpl extends AbstractConfigModifyVerifyService { +public class ThreadPoolManageConfigModificationVerifyServiceImpl extends AbstractConfigModificationVerifyService { @Resource private ThreadPoolService threadPoolService; diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java index 96fa3fbc..784e10f5 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java @@ -19,7 +19,6 @@ package cn.hippo4j.config.service.biz.impl; import cn.hippo4j.common.constant.ConfigModifyTypeConstants; import cn.hippo4j.common.enums.DelEnum; -import cn.hippo4j.common.enums.EnableEnum; import cn.hippo4j.common.toolkit.JSONUtil; import cn.hippo4j.common.toolkit.UserContext; import cn.hippo4j.config.mapper.ConfigInfoMapper; @@ -30,7 +29,7 @@ import cn.hippo4j.config.service.biz.ConfigService; import cn.hippo4j.config.service.biz.OperationLogService; import cn.hippo4j.config.service.biz.ThreadPoolService; import cn.hippo4j.config.toolkit.BeanUtil; -import cn.hippo4j.config.verify.ConfigModifyVerifyServiceChoose; +import cn.hippo4j.config.verify.ConfigModificationVerifyServiceChoose; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.StringUtils; @@ -55,7 +54,7 @@ public class ThreadPoolServiceImpl implements ThreadPoolService { private final OperationLogService operationLogService; - private final ConfigModifyVerifyServiceChoose configModifyVerifyServiceChoose; + private final ConfigModificationVerifyServiceChoose configModificationVerifyServiceChoose; @Override public IPage queryThreadPoolPage(ThreadPoolQueryReqDTO reqDTO) { @@ -97,7 +96,7 @@ public class ThreadPoolServiceImpl implements ThreadPoolService { modifySaveReqDTO.setModifyUser(UserContext.getUserName()); modifySaveReqDTO.setModifyAll(false); modifySaveReqDTO.setType(ConfigModifyTypeConstants.THREAD_POOL_MANAGER); - configModifyVerifyServiceChoose.choose(modifySaveReqDTO.getType()).saveConfigModifyApplication(modifySaveReqDTO); + configModificationVerifyServiceChoose.choose(modifySaveReqDTO.getType()).saveConfigModifyApplication(modifySaveReqDTO); } } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModifyVerifyServiceImpl.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModificationVerifyServiceImpl.java similarity index 93% rename from hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModifyVerifyServiceImpl.java rename to hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModificationVerifyServiceImpl.java index ab0598d3..ecfa9437 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModifyVerifyServiceImpl.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/WebThreadPoolConfigModificationVerifyServiceImpl.java @@ -29,7 +29,7 @@ import static cn.hippo4j.common.constant.Constants.HTTP_EXECUTE_TIMEOUT; @Slf4j @Service -public class WebThreadPoolConfigModifyVerifyServiceImpl extends AbstractConfigModifyVerifyService { +public class WebThreadPoolConfigModificationVerifyServiceImpl extends AbstractConfigModificationVerifyService { @Override public Integer type() { diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModifyVerifyServiceChoose.java b/hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModificationVerifyServiceChoose.java similarity index 75% rename from hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModifyVerifyServiceChoose.java rename to hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModificationVerifyServiceChoose.java index ce70bb15..f440e887 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModifyVerifyServiceChoose.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModificationVerifyServiceChoose.java @@ -19,7 +19,7 @@ package cn.hippo4j.config.verify; import cn.hippo4j.common.config.ApplicationContextHolder; import cn.hippo4j.common.constant.ConfigModifyTypeConstants; -import cn.hippo4j.config.service.biz.ConfigModifyVerifyService; +import cn.hippo4j.config.service.biz.ConfigModificationVerifyService; import com.google.common.collect.Maps; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; @@ -30,12 +30,12 @@ import java.util.Map; * config change verify service choose */ @Component -public class ConfigModifyVerifyServiceChoose implements CommandLineRunner { +public class ConfigModificationVerifyServiceChoose implements CommandLineRunner { /** * Storage config change verify service container. */ - private Map configChangeVerifyServiceChooseMap = Maps.newHashMap(); + private Map configChangeVerifyServiceChooseMap = Maps.newHashMap(); /** * Choose by type. @@ -43,15 +43,15 @@ public class ConfigModifyVerifyServiceChoose implements CommandLineRunner { * @param type {@link ConfigModifyTypeConstants} * @return */ - public ConfigModifyVerifyService choose(Integer type) { - ConfigModifyVerifyService verifyService = configChangeVerifyServiceChooseMap.get(type); + public ConfigModificationVerifyService choose(Integer type) { + ConfigModificationVerifyService verifyService = configChangeVerifyServiceChooseMap.get(type); return verifyService; } @Override public void run(String... args) throws Exception { - Map configChangeVerifyServiceMap = - ApplicationContextHolder.getBeansOfType(ConfigModifyVerifyService.class); + Map configChangeVerifyServiceMap = + ApplicationContextHolder.getBeansOfType(ConfigModificationVerifyService.class); configChangeVerifyServiceMap.values().forEach(each -> configChangeVerifyServiceChooseMap.put(each.type(), each)); } } 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 d30eb7d7..7a927a10 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 @@ -21,9 +21,13 @@ import cn.hippo4j.common.constant.Constants; import cn.hippo4j.common.toolkit.ConditionUtil; import cn.hippo4j.common.web.base.Result; import cn.hippo4j.common.web.base.Results; +import cn.hippo4j.config.model.biz.threadpool.ConfigModificationQueryRespDTO; import cn.hippo4j.config.model.biz.threadpool.ConfigModifyVerifyReqDTO; -import cn.hippo4j.config.service.biz.ConfigModifyVerifyService; -import cn.hippo4j.config.verify.ConfigModifyVerifyServiceChoose; +import cn.hippo4j.config.model.biz.threadpool.ThreadPoolQueryReqDTO; +import cn.hippo4j.config.service.biz.ConfigModificationQueryService; +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; @@ -35,11 +39,13 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping(Constants.VERIFY_PATH) public class ConfigVerifyController { - private final ConfigModifyVerifyServiceChoose serviceChoose; + private final ConfigModificationVerifyServiceChoose serviceChoose; + + private final ConfigModificationQueryService queryService; @PostMapping public Result verifyConfigModification(@RequestBody ConfigModifyVerifyReqDTO reqDTO) { - ConfigModifyVerifyService modifyVerifyService = serviceChoose.choose(reqDTO.getType()); + ConfigModificationVerifyService modifyVerifyService = serviceChoose.choose(reqDTO.getType()); ConditionUtil .condition(reqDTO.getAccept(), () -> modifyVerifyService.acceptModification(reqDTO), @@ -47,4 +53,9 @@ public class ConfigVerifyController { return Results.success(); } + @PostMapping("/query/application/page") + public Result> modificationApplicationPage(@RequestBody ThreadPoolQueryReqDTO reqDTO) { + return Results.success(queryService.queryApplicationPage(reqDTO)); + } + } diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java index fc9e79ae..df3c7ec8 100644 --- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java +++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolAdapterController.java @@ -27,7 +27,7 @@ import cn.hippo4j.config.model.biz.adapter.ThreadPoolAdapterRespDTO; import cn.hippo4j.config.model.biz.threadpool.ConfigModifySaveReqDTO; import cn.hippo4j.config.service.ThreadPoolAdapterService; import cn.hippo4j.config.toolkit.BeanUtil; -import cn.hippo4j.config.verify.ConfigModifyVerifyServiceChoose; +import cn.hippo4j.config.verify.ConfigModificationVerifyServiceChoose; import cn.hutool.core.text.StrBuilder; import cn.hutool.http.HttpUtil; import lombok.AllArgsConstructor; @@ -51,7 +51,7 @@ public class ThreadPoolAdapterController { private final ThreadPoolAdapterService threadPoolAdapterService; - private final ConfigModifyVerifyServiceChoose configModifyVerifyServiceChoose; + private final ConfigModificationVerifyServiceChoose configModificationVerifyServiceChoose; @GetMapping(REGISTER_ADAPTER_BASE_PATH + "/query") public Result> queryAdapterThreadPool(ThreadPoolAdapterReqDTO requestParameter) { @@ -79,7 +79,7 @@ public class ThreadPoolAdapterController { modifySaveReqDTO.setItemId(requestParameter.getItem()); modifySaveReqDTO.setTpId(requestParameter.getThreadPoolKey()); modifySaveReqDTO.setType(ConfigModifyTypeConstants.ADAPTER_THREAD_POOL); - configModifyVerifyServiceChoose.choose(modifySaveReqDTO.getType()).saveConfigModifyApplication(modifySaveReqDTO); + configModificationVerifyServiceChoose.choose(modifySaveReqDTO.getType()).saveConfigModifyApplication(modifySaveReqDTO); } return Results.success(); } diff --git a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java index 2199437a..05891903 100644 --- a/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java +++ b/hippo4j-console/src/main/java/cn/hippo4j/console/controller/ThreadPoolController.java @@ -31,7 +31,7 @@ import cn.hippo4j.config.model.biz.threadpool.*; import cn.hippo4j.config.service.ConfigCacheService; import cn.hippo4j.config.service.biz.ThreadPoolService; import cn.hippo4j.config.toolkit.BeanUtil; -import cn.hippo4j.config.verify.ConfigModifyVerifyServiceChoose; +import cn.hippo4j.config.verify.ConfigModificationVerifyServiceChoose; import cn.hippo4j.console.model.ThreadPoolInstanceInfo; import cn.hippo4j.console.model.WebThreadPoolReqDTO; import cn.hippo4j.console.model.WebThreadPoolRespDTO; @@ -66,7 +66,7 @@ public class ThreadPoolController { private final BaseInstanceRegistry baseInstanceRegistry; - private final ConfigModifyVerifyServiceChoose configModifyVerifyServiceChoose; + private final ConfigModificationVerifyServiceChoose configModificationVerifyServiceChoose; @PostMapping("/query/page") public Result> queryNameSpacePage(@RequestBody ThreadPoolQueryReqDTO reqDTO) { @@ -183,7 +183,7 @@ public class ThreadPoolController { ConfigModifySaveReqDTO modifySaveReqDTO = BeanUtil.convert(requestParam, ConfigModifySaveReqDTO.class); modifySaveReqDTO.setModifyUser(UserContext.getUserName()); modifySaveReqDTO.setType(ConfigModifyTypeConstants.WEB_THREAD_POOL); - configModifyVerifyServiceChoose.choose(modifySaveReqDTO.getType()).saveConfigModifyApplication(modifySaveReqDTO); + configModificationVerifyServiceChoose.choose(modifySaveReqDTO.getType()).saveConfigModifyApplication(modifySaveReqDTO); } return Results.success(); }