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-07-01 14:44:38 +08:00
parent 72800e1e44
commit 47e3e5218d
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,28 +15,22 @@ import javax.validation.constraints.*;
public class SysTestConfigParam { public class SysTestConfigParam {
@ApiModelProperty(value = "检测报告是否自动生成0 否；1是") @ApiModelProperty(value = "检测报告是否自动生成0 否；1是")
@NotNull(message = SystemValidMessage.AUTO_GENERATE_NOT_NULL)
@Min(value = 0, message = SystemValidMessage.AUTO_GENERATE_FORMAT_ERROR) @Min(value = 0, message = SystemValidMessage.AUTO_GENERATE_FORMAT_ERROR)
@Max(value = 1, message = SystemValidMessage.AUTO_GENERATE_FORMAT_ERROR) @Max(value = 1, message = SystemValidMessage.AUTO_GENERATE_FORMAT_ERROR)
private Integer autoGenerate; private Integer autoGenerate;
@ApiModelProperty(value = "最大检测次数") @ApiModelProperty(value = "最大检测次数")
@NotNull(message = SystemValidMessage.MAX_RECHECK_NOT_NULL)
private Integer maxTime; private Integer maxTime;
@ApiModelProperty(value = "数据精度") @ApiModelProperty(value = "数据精度")
@NotNull(message = SystemValidMessage.SCALE_NOT_NULL)
private Integer scale; private Integer scale;
// @ApiModelProperty(value = "数据处理规则") @ApiModelProperty(value = "场景")
// @NotBlank(message = SystemValidMessage.DATA_RULE_NOT_BLANK) private String scene;
// @Pattern(regexp = PatternRegex.SYSTEM_ID, message = SystemValidMessage.DATA_RULE_FORMAT_ERROR)
// private String dataRule;
@Data @Data
public static class UpdateParam extends SysTestConfigParam { public static class UpdateParam extends SysTestConfigParam {
@ApiModelProperty("id") @ApiModelProperty("id")
@NotBlank(message = SystemValidMessage.ID_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = SystemValidMessage.ID_FORMAT_ERROR) @Pattern(regexp = PatternRegex.SYSTEM_ID, message = SystemValidMessage.ID_FORMAT_ERROR)
private String id; private String id;
} }

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

@@ -3,7 +3,6 @@ package com.njcn.gather.system.cfg.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.common.pojo.enums.common.DataStateEnum;
import com.njcn.gather.system.cfg.mapper.SysTestConfigMapper; import com.njcn.gather.system.cfg.mapper.SysTestConfigMapper;
import com.njcn.gather.system.cfg.pojo.param.SysTestConfigParam; 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 com.njcn.gather.system.dictionary.service.IDictDataService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@@ -45,9 +44,12 @@ public class SysTestConfigServiceImpl extends ServiceImpl<SysTestConfigMapper, S
@Override @Override
@Transactional @Transactional
public boolean updateTestConfig(SysTestConfigParam.UpdateParam param) { public boolean updateTestConfig(SysTestConfigParam.UpdateParam param) {
SysTestConfig sysTestConfig = new SysTestConfig(); SysTestConfig oneConfig = this.getOneConfig();
BeanUtils.copyProperties(param, sysTestConfig); oneConfig.setAutoGenerate(ObjectUtil.isNotNull(param.getAutoGenerate()) ? param.getAutoGenerate() : oneConfig.getAutoGenerate());
return this.updateById(sysTestConfig); oneConfig.setScale(ObjectUtil.isNotNull(param.getScale()) ? param.getScale() : oneConfig.getScale());
oneConfig.setMaxTime(ObjectUtil.isNotNull(param.getMaxTime()) ? param.getMaxTime() : oneConfig.getMaxTime());
oneConfig.setScene(StringUtils.isNotBlank(param.getScene()) ? param.getScene() : oneConfig.getScene());
return this.updateById(oneConfig);
} }
@Override @Override
@@ -62,7 +64,7 @@ public class SysTestConfigServiceImpl extends ServiceImpl<SysTestConfigMapper, S
public String getCurrrentScene() { public String getCurrrentScene() {
String scene = getOneConfig().getScene(); String scene = getOneConfig().getScene();
DictData dictData = dictDataService.getDictDataById(scene); DictData dictData = dictDataService.getDictDataById(scene);
if(ObjectUtil.isNotNull(dictData)){ if (ObjectUtil.isNotNull(dictData)) {
return dictData.getValue(); return dictData.getValue();
} }
return null; return null;

1
user/src/main/java/com/njcn/gather/user/user/controller/AuthController.java
View File

@@ -79,6 +79,7 @@ public class AuthController extends BaseController {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("name", user.getName()); map.put("name", user.getName());
map.put("id", user.getId()); map.put("id", user.getId());
map.put("loginName",user.getLoginName());
token.setUserInfo(map); token.setUserInfo(map);