ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

检测计划新增数据处理原则字段、全局配置中移除数据处理原则字段

Browse Source
This commit is contained in:
caozehui
2025-05-14 08:57:24 +08:00
parent ab2e5c346e
commit 2f303e63a3
12 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/src/main/java/com/njcn/gather/system/cfg/controller/SysTestConfigController.java
View File

@@ -36,9 +36,9 @@ public class SysTestConfigController extends BaseController {
@GetMapping("/getConfig")
@ApiOperation("获取检测相关配置信息")
public HttpResult<SysTestConfig> getConfig() {
String methodDescribe = getMethodDescribe("list");
String methodDescribe = getMethodDescribe("getConfig");
LogUtil.njcnDebug(log, "{}", methodDescribe);
SysTestConfig sysTestConfig = sysTestConfigService.getConfig();
SysTestConfig sysTestConfig = sysTestConfigService.getOneConfig();
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, sysTestConfig, methodDescribe);
}

8
system/src/main/java/com/njcn/gather/system/cfg/pojo/param/SysTestConfigParam.java
View File

@@ -24,10 +24,10 @@ public class SysTestConfigParam {
@NotNull(message = SystemValidMessage.MAX_RECHECK_NOT_NULL)
private Integer maxTime;
@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 = "数据处理规则")
// @NotBlank(message = SystemValidMessage.DATA_RULE_NOT_BLANK)
// @Pattern(regexp = PatternRegex.SYSTEM_ID, message = SystemValidMessage.DATA_RULE_FORMAT_ERROR)
// private String dataRule;
@Data
public static class UpdateParam extends SysTestConfigParam {

4
system/src/main/java/com/njcn/gather/system/cfg/pojo/po/SysTestConfig.java
View File

@@ -37,8 +37,8 @@ public class SysTestConfig extends BaseEntity implements Serializable {
/**
* 数据处理规则, 关联字典（所有值、部分值、cp95值、平均值、任意值），默认任意值
*/
@TableField("Data_Rule")
private String dataRule;
// @TableField("Data_Rule")
// private String dataRule;
/**
* 业务场景

6
system/src/main/java/com/njcn/gather/system/cfg/service/ISysTestConfigService.java
View File

@@ -10,12 +10,6 @@ import com.njcn.gather.system.cfg.pojo.po.SysTestConfig;
*/
public interface ISysTestConfigService extends IService<SysTestConfig> {
/**
* 获取检测配置
* @return
*/
SysTestConfig getConfig();
/**
* 添加检测配置
* @param scene 场景

16
system/src/main/java/com/njcn/gather/system/cfg/service/impl/SysTestConfigServiceImpl.java
View File

@@ -28,10 +28,6 @@ public class SysTestConfigServiceImpl extends ServiceImpl<SysTestConfigMapper, S
private final IDictDataService dictDataService;
@Override
public SysTestConfig getConfig() {
return this.getOne(new QueryWrapper<SysTestConfig>().last("LIMIT 1"));
}
@Override
@Transactional
@@ -40,7 +36,7 @@ public class SysTestConfigServiceImpl extends ServiceImpl<SysTestConfigMapper, S
sysTestConfig.setAutoGenerate(1);
// 最大被检次数默认为3次
sysTestConfig.setMaxTime(3);
sysTestConfig.setDataRule("46cf964bd76fb12a19cfb1700442eeeb"); // 任意值
//sysTestConfig.setDataRule("46cf964bd76fb12a19cfb1700442eeeb"); // 任意值
sysTestConfig.setScene(scene);
sysTestConfig.setState(DataStateEnum.ENABLE.getCode());
return this.save(sysTestConfig);
@@ -56,12 +52,10 @@ public class SysTestConfigServiceImpl extends ServiceImpl<SysTestConfigMapper, S
@Override
public SysTestConfig getOneConfig() {
MPJLambdaWrapper<SysTestConfig> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(SysTestConfig.class)
.selectAs(DictData::getCode, SysTestConfig::getDataRule)
.leftJoin(DictData.class, DictData::getId, SysTestConfig::getDataRule)
.eq(SysTestConfig::getState, DataStateEnum.ENABLE.getCode());
return this.getBaseMapper().selectJoinOne(SysTestConfig.class, queryWrapper);
QueryWrapper<SysTestConfig> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("state", DataStateEnum.ENABLE.getCode());
queryWrapper.last("LIMIT 1");
return this.getOne(queryWrapper);
}
@Override