finish modify application query page

pull/776/head
yewei 3 years ago
parent c84a44b167
commit 3720616b53

@ -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<ConfigInfoBase> 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);
}

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

@ -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<ConfigModificationQueryRespDTO> queryApplicationPage(ThreadPoolQueryReqDTO reqDTO);
}

@ -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

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

@ -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() {

@ -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<ConfigModificationQueryRespDTO> queryApplicationPage(ThreadPoolQueryReqDTO reqDTO) {
LambdaQueryWrapper<HisConfigVerifyInfo> 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));
}
}

@ -29,7 +29,7 @@ import javax.annotation.Resource;
@Slf4j
@Service
public class ThreadPoolInstanceConfigModifyVerifyServiceImpl extends AbstractConfigModifyVerifyService {
public class ThreadPoolInstanceConfigModificationVerifyServiceImpl extends AbstractConfigModificationVerifyService {
@Resource
private ConfigService configService;

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

@ -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<ThreadPoolRespDTO> 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);
}
}

@ -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() {

@ -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<Integer, ConfigModifyVerifyService> configChangeVerifyServiceChooseMap = Maps.newHashMap();
private Map<Integer, ConfigModificationVerifyService> 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<String, ConfigModifyVerifyService> configChangeVerifyServiceMap =
ApplicationContextHolder.getBeansOfType(ConfigModifyVerifyService.class);
Map<String, ConfigModificationVerifyService> configChangeVerifyServiceMap =
ApplicationContextHolder.getBeansOfType(ConfigModificationVerifyService.class);
configChangeVerifyServiceMap.values().forEach(each -> configChangeVerifyServiceChooseMap.put(each.type(), each));
}
}

@ -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<Void> 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<IPage<ConfigModificationQueryRespDTO>> modificationApplicationPage(@RequestBody ThreadPoolQueryReqDTO reqDTO) {
return Results.success(queryService.queryApplicationPage(reqDTO));
}
}

@ -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<List<ThreadPoolAdapterRespDTO>> 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();
}

@ -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<IPage<ThreadPoolRespDTO>> 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();
}

Loading…
Cancel
Save