diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/HisConfigVerifyInfo.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/HisConfigVerifyInfo.java index b18381a8..a19b137d 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/HisConfigVerifyInfo.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/HisConfigVerifyInfo.java @@ -17,16 +17,14 @@ package cn.hippo4j.config.model; -import cn.hippo4j.common.model.ThreadPoolParameter; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonIgnore; -import lombok.Builder; import lombok.Data; import java.util.Date; /** - * his config verify info + * His config verify info */ @Data @TableName("his_config_verify") @@ -36,71 +34,71 @@ public class HisConfigVerifyInfo { private Long id; /** - * change type + * Change type */ private Integer type; /** - * tenant id + * Tenant id */ private String tenantId; /** - * item id + * Item id */ private String itemId; /** - * thread pool id + * Thread pool id */ private String tpId; /** - * thread pool mark + * Thread pool mark */ private String mark; /** - * thread pool instance identify + * Thread pool instance identify */ private String identify; /** - * config content + * Config content */ private String content; /** - * weather modify all thread pool instances + * Weather modify all thread pool instances */ private Boolean modifyAll = false; /** - * gmtCreate + * GmtCreate */ @JsonIgnore @TableField(fill = FieldFill.INSERT) private Date gmtCreate; /** - * modifyUserId + * ModifyUserId */ private String modifyUser; /** - * verify status + * Verify status */ private Integer verifyStatus; /** - * gmtVerify + * GmtVerify */ @JsonIgnore @TableField(fill = FieldFill.UPDATE) private Date gmtVerify; /** - * verifyUser + * VerifyUser */ private String verifyUser; } 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 index ddcb3511..331db35e 100644 --- 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 @@ -23,75 +23,75 @@ import lombok.Data; import java.util.Date; /** - * config modify query resp + * Config modify query resp */ @Data public class ConfigModificationQueryRespDTO { /** - * his_config_verify id + * His_config_verify id */ private String id; /** - * config modify type + * Config modify type */ private Integer type; /** - * thread pool mark + * Thread pool mark */ private String mark; /** - * tenant id + * Tenant id */ private String tenantId; /** - * item id + * Item id */ private String itemId; /** - * thread pool id + * Thread pool id */ private String tpId; /** - * thread pool identify + * Thread pool identify */ private String identify; /** - * weather modify all instances + * Weather modify all instances */ private Boolean modifyAll; /** - * modify user + * Modify user */ private String modifyUser; /** - * verify status + * Verify status */ private Integer verifyStatus; /** - * gmt create + * GmtCreate */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date gmtCreate; /** - * gmt verify + * GmtVerify */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date gmtVerify; /** - * verify user + * Verify user */ private String verifyUser; } 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 b94b91a9..035bd038 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 @@ -17,8 +17,6 @@ package cn.hippo4j.config.model.biz.threadpool; -import cn.hippo4j.common.enums.EnableEnum; -import cn.hippo4j.common.model.ThreadPoolParameter; import lombok.Data; import javax.validation.constraints.Pattern; @@ -32,23 +30,23 @@ public class ConfigModifySaveReqDTO { private Integer type; /** - * thread pool instance id + * Thread pool instance id */ private String identify; /** - * weather modify all instances + * Weather modify all instances */ private Boolean modifyAll = false; /** - * TenantId + * Tenant Id */ @Pattern(regexp = "^((?!\\+).)*$", message = "租户、项目、线程池 ID 包含+号") private String tenantId; /** - * Thread-pool id + * Thread pool id */ @Pattern(regexp = "^((?!\\+).)*$", message = "租户、项目、线程池 ID 包含+号") private String tpId; @@ -60,7 +58,7 @@ public class ConfigModifySaveReqDTO { private String itemId; /** - * thread pool mark + * Thread pool mark */ private String mark; diff --git a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifyVerifyReqDTO.java b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifyVerifyReqDTO.java index a6487207..946e4764 100644 --- a/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifyVerifyReqDTO.java +++ b/hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifyVerifyReqDTO.java @@ -23,18 +23,18 @@ import lombok.Data; import java.util.List; /** - * config modify verify dto + * Config modify verify dto */ @Data public class ConfigModifyVerifyReqDTO { /** - * his config verify id + * His config verify id */ - private Long id; + private String id; /** - * config verify type + * Config verify type */ private Integer type; @@ -44,38 +44,38 @@ public class ConfigModifyVerifyReqDTO { private String tenantId; /** - * item id + * Item id */ private String itemId; /** - * instance identify + * Instance identify */ private String identify; /** - * adapter thread pool mark + * Adapter thread pool mark */ private String mark; /** - * adapter thread pool key + * Adapter thread pool key */ private String threadPoolKey; /** - * Thread-pool id + * Thread pool id */ @JsonAlias("threadPoolId") private String tpId; /** - * weather modify all instances + * Weather modify all instances */ private Boolean modifyAll; /** - * weather accept config modification + * Weather accept config modification */ private Boolean accept; 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 194791e8..2f8d3f63 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 @@ -23,12 +23,12 @@ import cn.hippo4j.config.model.biz.threadpool.ThreadPoolQueryReqDTO; import com.baomidou.mybatisplus.core.metadata.IPage; /** - * config modification application query service + * Config modification application query service. */ public interface ConfigModificationQueryService { /** - * query config modification application page. + * Query config modification application page. * * @param reqDTO * @return @@ -36,7 +36,7 @@ public interface ConfigModificationQueryService { IPage queryApplicationPage(ThreadPoolQueryReqDTO reqDTO); /** - * query config modification detail by application id + * 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 afa84928..633df590 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 @@ -26,7 +26,7 @@ import cn.hippo4j.config.model.biz.threadpool.ConfigModifyVerifyReqDTO; public interface ConfigModificationVerifyService { /** - * Get type + * Get type. * * @return */ 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 1eccf5b5..93b3b6a1 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 @@ -56,7 +56,7 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM @Override public void rejectModification(ConfigModifyVerifyReqDTO reqDTO) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper() - .eq(HisConfigVerifyInfo::getId, reqDTO.getId()) + .eq(HisConfigVerifyInfo::getId, Long.parseLong(reqDTO.getId())) .set(HisConfigVerifyInfo::getVerifyStatus, VerifyEnum.VERIFY_REJECT.getVerifyStatus()) .set(HisConfigVerifyInfo::getGmtVerify, new Date()) .set(HisConfigVerifyInfo::getVerifyUser, UserContext.getUserName()); @@ -66,7 +66,7 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM public void acceptModification(ConfigModifyVerifyReqDTO reqDTO) { updateThreadPoolParameter(reqDTO); LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper() - .eq(HisConfigVerifyInfo::getId, reqDTO.getId()) + .eq(HisConfigVerifyInfo::getId, Long.parseLong(reqDTO.getId())) .set(HisConfigVerifyInfo::getVerifyStatus, VerifyEnum.VERIFY_ACCEPT.getVerifyStatus()) .set(HisConfigVerifyInfo::getGmtVerify, new Date()) .set(HisConfigVerifyInfo::getVerifyUser, UserContext.getUserName()); @@ -84,7 +84,7 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM } /** - * get client address + * Get client address. * * @param reqDTO * @return @@ -103,7 +103,8 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM } /** - * update thread pool parameter + * Update thread pool parameter. + * * @param reqDTO */ protected abstract void updateThreadPoolParameter(ConfigModifyVerifyReqDTO reqDTO); 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 df376855..313af1a0 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 @@ -57,8 +57,8 @@ public class ConfigVerifyController { } @GetMapping("/query/application/detail") - public Result modificationApplicationDetail(@RequestParam("id") Long id) { - return Results.success(queryService.queryApplicationDetail(id)); + public Result modificationApplicationDetail(@RequestParam("id") String id) { + return Results.success(queryService.queryApplicationDetail(Long.parseLong(id))); } }