msb-public
/
hippo4j
mirror of https://github.com/longtai-cn/hippo4j
1
0
Code Issues Projects Releases Wiki Activity

formatting code

Browse Source
pull/776/head
yewei 3 years ago
parent 93439b1b0c
commit c2ea317c40
8 changed files with 55 additions and 58 deletions
Show Stats Download Patch File Download Diff File

30
hippo4j-config/src/main/java/cn/hippo4j/config/model/HisConfigVerifyInfo.java
Unescape View File

@ -17,16 +17,14 @@
package cn.hippo4j.config.model; package cn.hippo4j.config.model;
import cn.hippo4j.common.model.ThreadPoolParameter;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import java.util.Date; import java.util.Date;
/** /**
* his config verify info * His config verify info
*/ */
@Data @Data
@TableName("his_config_verify") @TableName("his_config_verify")
@ -36,71 +34,71 @@ public class HisConfigVerifyInfo {
private Long id; private Long id;
/** /**
* change type * Change type
*/ */
private Integer type; private Integer type;
/** /**
* tenant id * Tenant id
*/ */
private String tenantId; private String tenantId;
/** /**
* item id * Item id
*/ */
private String itemId; private String itemId;
/** /**
* thread pool id * Thread pool id
*/ */
private String tpId; private String tpId;
/** /**
* thread pool mark * Thread pool mark
*/ */
private String mark; private String mark;
/** /**
* thread pool instance identify * Thread pool instance identify
*/ */
private String identify; private String identify;
/** /**
* config content * Config content
*/ */
private String content; private String content;
/** /**
* weather modify all thread pool instances * Weather modify all thread pool instances
*/ */
private Boolean modifyAll = false; private Boolean modifyAll = false;
/** /**
* gmtCreate * GmtCreate
*/ */
@JsonIgnore @JsonIgnore
@TableField(fill = FieldFill.INSERT) @TableField(fill = FieldFill.INSERT)
private Date gmtCreate; private Date gmtCreate;
/** /**
* modifyUserId * ModifyUserId
*/ */
private String modifyUser; private String modifyUser;
/** /**
* verify status * Verify status
*/ */
private Integer verifyStatus; private Integer verifyStatus;
/** /**
* gmtVerify * GmtVerify
*/ */
@JsonIgnore @JsonIgnore
@TableField(fill = FieldFill.UPDATE) @TableField(fill = FieldFill.UPDATE)
private Date gmtVerify; private Date gmtVerify;
/** /**
* verifyUser * VerifyUser
*/ */
private String verifyUser; private String verifyUser;
} }

28
hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModificationQueryRespDTO.java
Unescape View File

@ -23,75 +23,75 @@ import lombok.Data;
import java.util.Date; import java.util.Date;
/** /**
* config modify query resp * Config modify query resp
*/ */
@Data @Data
public class ConfigModificationQueryRespDTO { public class ConfigModificationQueryRespDTO {
/** /**
* his_config_verify id * His_config_verify id
*/ */
private String id; private String id;
/** /**
* config modify type * Config modify type
*/ */
private Integer type; private Integer type;
/** /**
* thread pool mark * Thread pool mark
*/ */
private String mark; private String mark;
/** /**
* tenant id * Tenant id
*/ */
private String tenantId; private String tenantId;
/** /**
* item id * Item id
*/ */
private String itemId; private String itemId;
/** /**
* thread pool id * Thread pool id
*/ */
private String tpId; private String tpId;
/** /**
* thread pool identify * Thread pool identify
*/ */
private String identify; private String identify;
/** /**
* weather modify all instances * Weather modify all instances
*/ */
private Boolean modifyAll; private Boolean modifyAll;
/** /**
* modify user * Modify user
*/ */
private String modifyUser; private String modifyUser;
/** /**
* verify status * Verify status
*/ */
private Integer verifyStatus; private Integer verifyStatus;
/** /**
* gmt create * GmtCreate
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date gmtCreate; private Date gmtCreate;
/** /**
* gmt verify * GmtVerify
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date gmtVerify; private Date gmtVerify;
/** /**
* verify user * Verify user
*/ */
private String verifyUser; private String verifyUser;
} }

10
hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifySaveReqDTO.java
Unescape View File

@ -17,8 +17,6 @@
package cn.hippo4j.config.model.biz.threadpool; package cn.hippo4j.config.model.biz.threadpool;
import cn.hippo4j.common.enums.EnableEnum;
import cn.hippo4j.common.model.ThreadPoolParameter;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.Pattern; import javax.validation.constraints.Pattern;
@ -32,12 +30,12 @@ public class ConfigModifySaveReqDTO {
private Integer type; private Integer type;
/** /**
* thread pool instance id * Thread pool instance id
*/ */
private String identify; private String identify;
/** /**
* weather modify all instances * Weather modify all instances
*/ */
private Boolean modifyAll = false; private Boolean modifyAll = false;
@ -48,7 +46,7 @@ public class ConfigModifySaveReqDTO {
private String tenantId; private String tenantId;
/** /**
* Thread-pool id * Thread pool id
*/ */
@Pattern(regexp = "^((?!\\+).)*$", message = "租户、项目、线程池 ID 包含+号") @Pattern(regexp = "^((?!\\+).)*$", message = "租户、项目、线程池 ID 包含+号")
private String tpId; private String tpId;
@ -60,7 +58,7 @@ public class ConfigModifySaveReqDTO {
private String itemId; private String itemId;
/** /**
* thread pool mark * Thread pool mark
*/ */
private String mark; private String mark;

22
hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ConfigModifyVerifyReqDTO.java
Unescape View File

@ -23,18 +23,18 @@ import lombok.Data;
import java.util.List; import java.util.List;
/** /**
* config modify verify dto * Config modify verify dto
*/ */
@Data @Data
public class ConfigModifyVerifyReqDTO { 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; private Integer type;
@ -44,38 +44,38 @@ public class ConfigModifyVerifyReqDTO {
private String tenantId; private String tenantId;
/** /**
* item id * Item id
*/ */
private String itemId; private String itemId;
/** /**
* instance identify * Instance identify
*/ */
private String identify; private String identify;
/** /**
* adapter thread pool mark * Adapter thread pool mark
*/ */
private String mark; private String mark;
/** /**
* adapter thread pool key * Adapter thread pool key
*/ */
private String threadPoolKey; private String threadPoolKey;
/** /**
* Thread-pool id * Thread pool id
*/ */
@JsonAlias("threadPoolId") @JsonAlias("threadPoolId")
private String tpId; private String tpId;
/** /**
* weather modify all instances * Weather modify all instances
*/ */
private Boolean modifyAll; private Boolean modifyAll;
/** /**
* weather accept config modification * Weather accept config modification
*/ */
private Boolean accept; private Boolean accept;

6
hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationQueryService.java
Unescape View File

@ -23,12 +23,12 @@ import cn.hippo4j.config.model.biz.threadpool.ThreadPoolQueryReqDTO;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
/** /**
* config modification application query service * Config modification application query service.
*/ */
public interface ConfigModificationQueryService { public interface ConfigModificationQueryService {
/** /**
* query config modification application page. * Query config modification application page.
* *
* @param reqDTO * @param reqDTO
* @return * @return
@ -36,7 +36,7 @@ public interface ConfigModificationQueryService {
IPage<ConfigModificationQueryRespDTO> queryApplicationPage(ThreadPoolQueryReqDTO reqDTO); IPage<ConfigModificationQueryRespDTO> queryApplicationPage(ThreadPoolQueryReqDTO reqDTO);
/** /**
* query config modification detail by application id * Query config modification detail by application id.
* *
* @param id * @param id
* @return * @return

2
hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/ConfigModificationVerifyService.java
Unescape View File

@ -26,7 +26,7 @@ import cn.hippo4j.config.model.biz.threadpool.ConfigModifyVerifyReqDTO;
public interface ConfigModificationVerifyService { public interface ConfigModificationVerifyService {
/** /**
* Get type * Get type.
* *
* @return * @return
*/ */

9
hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/AbstractConfigModificationVerifyService.java
Unescape View File

@ -56,7 +56,7 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM
@Override @Override
public void rejectModification(ConfigModifyVerifyReqDTO reqDTO) { public void rejectModification(ConfigModifyVerifyReqDTO reqDTO) {
LambdaUpdateWrapper<HisConfigVerifyInfo> updateWrapper = new LambdaUpdateWrapper<HisConfigVerifyInfo>() LambdaUpdateWrapper<HisConfigVerifyInfo> updateWrapper = new LambdaUpdateWrapper<HisConfigVerifyInfo>()
.eq(HisConfigVerifyInfo::getId, reqDTO.getId()) .eq(HisConfigVerifyInfo::getId, Long.parseLong(reqDTO.getId()))
.set(HisConfigVerifyInfo::getVerifyStatus, VerifyEnum.VERIFY_REJECT.getVerifyStatus()) .set(HisConfigVerifyInfo::getVerifyStatus, VerifyEnum.VERIFY_REJECT.getVerifyStatus())
.set(HisConfigVerifyInfo::getGmtVerify, new Date()) .set(HisConfigVerifyInfo::getGmtVerify, new Date())
.set(HisConfigVerifyInfo::getVerifyUser, UserContext.getUserName()); .set(HisConfigVerifyInfo::getVerifyUser, UserContext.getUserName());
@ -66,7 +66,7 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM
public void acceptModification(ConfigModifyVerifyReqDTO reqDTO) { public void acceptModification(ConfigModifyVerifyReqDTO reqDTO) {
updateThreadPoolParameter(reqDTO); updateThreadPoolParameter(reqDTO);
LambdaUpdateWrapper<HisConfigVerifyInfo> updateWrapper = new LambdaUpdateWrapper<HisConfigVerifyInfo>() LambdaUpdateWrapper<HisConfigVerifyInfo> updateWrapper = new LambdaUpdateWrapper<HisConfigVerifyInfo>()
.eq(HisConfigVerifyInfo::getId, reqDTO.getId()) .eq(HisConfigVerifyInfo::getId, Long.parseLong(reqDTO.getId()))
.set(HisConfigVerifyInfo::getVerifyStatus, VerifyEnum.VERIFY_ACCEPT.getVerifyStatus()) .set(HisConfigVerifyInfo::getVerifyStatus, VerifyEnum.VERIFY_ACCEPT.getVerifyStatus())
.set(HisConfigVerifyInfo::getGmtVerify, new Date()) .set(HisConfigVerifyInfo::getGmtVerify, new Date())
.set(HisConfigVerifyInfo::getVerifyUser, UserContext.getUserName()); .set(HisConfigVerifyInfo::getVerifyUser, UserContext.getUserName());
@ -84,7 +84,7 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM
} }
/** /**
* get client address * Get client address.
* *
* @param reqDTO * @param reqDTO
* @return * @return
@ -103,7 +103,8 @@ public abstract class AbstractConfigModificationVerifyService implements ConfigM
} }
/** /**
* update thread pool parameter * Update thread pool parameter.
*
* @param reqDTO * @param reqDTO
*/ */
protected abstract void updateThreadPoolParameter(ConfigModifyVerifyReqDTO reqDTO); protected abstract void updateThreadPoolParameter(ConfigModifyVerifyReqDTO reqDTO);

4
hippo4j-console/src/main/java/cn/hippo4j/console/controller/ConfigVerifyController.java
Unescape View File

@ -57,8 +57,8 @@ public class ConfigVerifyController {
} }
@GetMapping("/query/application/detail") @GetMapping("/query/application/detail")
public Result<ThreadPoolParameterInfo> modificationApplicationDetail(@RequestParam("id") Long id) { public Result<ThreadPoolParameterInfo> modificationApplicationDetail(@RequestParam("id") String id) {
return Results.success(queryService.queryApplicationDetail(id)); return Results.success(queryService.queryApplicationDetail(Long.parseLong(id)));
} }
} }

Write Preview
Loading…
Cancel
Save