diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/constant/ConfigModifyTypeConstants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/constant/ConfigModifyTypeConstants.java index 9272d51f..06e009cc 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/constant/ConfigModifyTypeConstants.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/constant/ConfigModifyTypeConstants.java @@ -26,5 +26,4 @@ public class ConfigModifyTypeConstants { public static final int WEB_THREAD_POOL = 3; public static final int ADAPTER_THREAD_POOL = 4; - } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifySaveReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifySaveReqDTO.java index 02704795..b94b91a9 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifySaveReqDTO.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifySaveReqDTO.java @@ -27,7 +27,7 @@ import javax.validation.constraints.Pattern; public class ConfigModifySaveReqDTO { /** - * thread pool config change type + * Thread pool config change type. */ private Integer type; 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 b34401c8..194791e8 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 @@ -28,7 +28,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; public interface ConfigModificationQueryService { /** - * query config modification application page + * query config modification application page. + * * @param reqDTO * @return */ @@ -36,6 +37,7 @@ public interface ConfigModificationQueryService { /** * query config modification detail by application id + * * @param id * @return */ diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationVerifyService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationVerifyService.java index aeb6f182..afa84928 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationVerifyService.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationVerifyService.java @@ -21,30 +21,34 @@ import cn.hippo4j.config.model.biz.threadpool.ConfigModifySaveReqDTO; import cn.hippo4j.config.model.biz.threadpool.ConfigModifyVerifyReqDTO; /** - * config modification verify service + * Config modification verify service. */ public interface ConfigModificationVerifyService { /** - * get type + * Get type + * * @return */ Integer type(); /** - * save config change application + * Save config change application. + * * @param reqDTO */ void saveConfigModifyApplication(ConfigModifySaveReqDTO reqDTO); /** - * reject config modification + * Reject config modification. + * * @param reqDTO */ void rejectModification(ConfigModifyVerifyReqDTO reqDTO); /** - * accept config modification + * Accept config modification. + * * @param reqDTO */ void acceptModification(ConfigModifyVerifyReqDTO reqDTO); diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java index 8463eb98..1eccf5b5 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java @@ -50,7 +50,6 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM HisConfigVerifyInfo hisConfigVerifyInfo = BeanUtil.convert(reqDTO, HisConfigVerifyInfo.class); hisConfigVerifyInfo.setContent(JSONUtil.toJSONString(reqDTO)); hisConfigVerifyInfo.setVerifyStatus(VerifyEnum.TO_VERIFY.getVerifyStatus()); - hisConfigVerifyMapper.insert(hisConfigVerifyInfo); } @@ -61,22 +60,17 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM .set(HisConfigVerifyInfo::getVerifyStatus, VerifyEnum.VERIFY_REJECT.getVerifyStatus()) .set(HisConfigVerifyInfo::getGmtVerify, new Date()) .set(HisConfigVerifyInfo::getVerifyUser, UserContext.getUserName()); - hisConfigVerifyMapper.update(null, updateWrapper); - } public void acceptModification(ConfigModifyVerifyReqDTO reqDTO) { updateThreadPoolParameter(reqDTO); - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper() .eq(HisConfigVerifyInfo::getId, reqDTO.getId()) .set(HisConfigVerifyInfo::getVerifyStatus, VerifyEnum.VERIFY_ACCEPT.getVerifyStatus()) .set(HisConfigVerifyInfo::getGmtVerify, new Date()) .set(HisConfigVerifyInfo::getVerifyUser, UserContext.getUserName()); - hisConfigVerifyMapper.update(null, updateWrapper); - Date gmtVerify = hisConfigVerifyMapper.selectById(reqDTO.getId()).getGmtVerify(); LambdaUpdateWrapper invalidUpdateWrapper = new LambdaUpdateWrapper() .eq(HisConfigVerifyInfo::getType, reqDTO.getType()) @@ -87,11 +81,11 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM .lt(HisConfigVerifyInfo::getGmtVerify, gmtVerify) .set(HisConfigVerifyInfo::getVerifyStatus, VerifyEnum.VERIFY_INVALID.getVerifyStatus()); hisConfigVerifyMapper.update(null, invalidUpdateWrapper); - } /** * get client address + * * @param reqDTO * @return */ @@ -103,7 +97,7 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM () -> leases.forEach(lease -> clientAddressList.add(lease.getHolder().getCallBackUrl())), () -> clientAddressList.add( leases.stream() - .filter(lease -> lease.getHolder().getIdentify().equals(reqDTO.getIdentify())).findAny().orElseThrow(() -> new RuntimeException("线程池实例并不存在")).getHolder() + .filter(lease -> lease.getHolder().getIdentify().equals(reqDTO.getIdentify())).findAny().orElseThrow(() -> new RuntimeException("该线程池实例不存在")).getHolder() .getCallBackUrl())); return clientAddressList; } @@ -113,5 +107,4 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM * @param reqDTO */ protected abstract void updateThreadPoolParameter(ConfigModifyVerifyReqDTO reqDTO); - } diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModificationVerifyServiceChoose.java b/hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModificationVerifyServiceChoose.java index fcb064da..98769559 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModificationVerifyServiceChoose.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModificationVerifyServiceChoose.java @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.Map; /** - * config change verify service choose + * Config change verify service choose */ @Component public class ConfigModificationVerifyServiceChoose implements CommandLineRunner {