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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wr
2025-02-10 16:23:29 +08:00
parent 8bc0498b9f 92b34ac4c1
commit 2c70ae0696
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java
View File

@@ -199,12 +199,12 @@ public class PqSourceServiceImpl extends ServiceImpl<PqSourceMapper, PqSource> i
* @return 检测源名称 * @return 检测源名称
*/ */
private String generatePqSourceName(PqSourceParam param, boolean isAdd) { private String generatePqSourceName(PqSourceParam param, boolean isAdd) {
DevType devType = devTypeService.getById(param.getDevType()); DictData devType = dictDataService.getDictDataById(param.getDevType());
DictData typeDictData = dictDataService.getDictDataById(param.getType()); DictData typeDictData = dictDataService.getDictDataById(param.getType());
if (ObjectUtil.isNotNull(devType) && ObjectUtil.isNotNull(typeDictData)) { if (ObjectUtil.isNotNull(devType) && ObjectUtil.isNotNull(typeDictData)) {
if (isAdd) { if (isAdd) {
int count = this.lambdaQuery().eq(PqSource::getPattern, param.getPattern()).count(); int count = this.lambdaQuery().eq(PqSource::getPattern, param.getPattern()).eq(PqSource::getState, DataStateEnum.ENABLE.getCode()).count();
return typeDictData.getName() + "-" + devType.getName() + "-" + (count + 1); return typeDictData.getName() + "-" + devType.getName() + "-" + (count + 1);
} else { } else {
PqSource pqSource = this.lambdaQuery().eq(PqSource::getId, ((PqSourceParam.UpdateParam) param).getId()).one(); PqSource pqSource = this.lambdaQuery().eq(PqSource::getId, ((PqSourceParam.UpdateParam) param).getId()).one();