diff --git a/system/src/main/java/com/njcn/gather/system/cfg/pojo/param/SysTestConfigParam.java b/system/src/main/java/com/njcn/gather/system/cfg/pojo/param/SysTestConfigParam.java index f22ef846..f3f8e971 100644 --- a/system/src/main/java/com/njcn/gather/system/cfg/pojo/param/SysTestConfigParam.java +++ b/system/src/main/java/com/njcn/gather/system/cfg/pojo/param/SysTestConfigParam.java @@ -15,28 +15,22 @@ import javax.validation.constraints.*; public class SysTestConfigParam { @ApiModelProperty(value = "检测报告是否自动生成0 否;1是") - @NotNull(message = SystemValidMessage.AUTO_GENERATE_NOT_NULL) @Min(value = 0, message = SystemValidMessage.AUTO_GENERATE_FORMAT_ERROR) @Max(value = 1, message = SystemValidMessage.AUTO_GENERATE_FORMAT_ERROR) private Integer autoGenerate; @ApiModelProperty(value = "最大检测次数") - @NotNull(message = SystemValidMessage.MAX_RECHECK_NOT_NULL) private Integer maxTime; @ApiModelProperty(value = "数据精度") - @NotNull(message = SystemValidMessage.SCALE_NOT_NULL) private Integer scale; -// @ApiModelProperty(value = "数据处理规则") -// @NotBlank(message = SystemValidMessage.DATA_RULE_NOT_BLANK) -// @Pattern(regexp = PatternRegex.SYSTEM_ID, message = SystemValidMessage.DATA_RULE_FORMAT_ERROR) -// private String dataRule; + @ApiModelProperty(value = "场景") + private String scene; @Data public static class UpdateParam extends SysTestConfigParam { @ApiModelProperty("id") - @NotBlank(message = SystemValidMessage.ID_NOT_BLANK) @Pattern(regexp = PatternRegex.SYSTEM_ID, message = SystemValidMessage.ID_FORMAT_ERROR) private String id; } diff --git a/system/src/main/java/com/njcn/gather/system/cfg/service/impl/SysTestConfigServiceImpl.java b/system/src/main/java/com/njcn/gather/system/cfg/service/impl/SysTestConfigServiceImpl.java index fd4b2658..e447c3dd 100644 --- a/system/src/main/java/com/njcn/gather/system/cfg/service/impl/SysTestConfigServiceImpl.java +++ b/system/src/main/java/com/njcn/gather/system/cfg/service/impl/SysTestConfigServiceImpl.java @@ -3,7 +3,6 @@ package com.njcn.gather.system.cfg.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.gather.system.cfg.mapper.SysTestConfigMapper; import com.njcn.gather.system.cfg.pojo.param.SysTestConfigParam; @@ -13,7 +12,7 @@ import com.njcn.gather.system.dictionary.pojo.po.DictData; import com.njcn.gather.system.dictionary.service.IDictDataService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -45,9 +44,12 @@ public class SysTestConfigServiceImpl extends ServiceImpl map = new HashMap<>(); map.put("name", user.getName()); map.put("id", user.getId()); + map.put("loginName",user.getLoginName()); token.setUserInfo(map);