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

复检测试项bug、设备连接异常提示信息、心跳空指针异常

Browse Source
This commit is contained in:
caozehui
2025-05-23 15:34:01 +08:00
parent 21dcd87be2
commit 1380af6d50
17 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictDataServiceImpl.java
View File

@@ -77,6 +77,7 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
@Override
@Transactional
public boolean addDictData(DictDataParam dictDataParam) {
dictDataParam.setName(dictDataParam.getName().trim());
checkDicDataName(dictDataParam, false);
DictData dictData = new DictData();
BeanUtil.copyProperties(dictDataParam, dictData);
@@ -89,6 +90,7 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
@Override
@Transactional
public boolean updateDictData(DictDataParam.UpdateParam updateParam) {
updateParam.setName(updateParam.getName().trim());
checkDicDataName(updateParam, true);
DictData dictData = new DictData();
BeanUtil.copyProperties(updateParam, dictData);

2
system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictPqServiceImpl.java
View File

@@ -58,6 +58,7 @@ public class DictPqServiceImpl extends ServiceImpl<DictPqMapper, DictPq> impleme
@Override
@Transactional
public boolean addDictPq(DictPqParam dictPqParam) {
dictPqParam.setName(dictPqParam.getName().trim());
checkDicPqName(dictPqParam, false);
DictPq dictPq = new DictPq();
BeanUtil.copyProperties(dictPqParam, dictPq);
@@ -69,6 +70,7 @@ public class DictPqServiceImpl extends ServiceImpl<DictPqMapper, DictPq> impleme
@Override
@Transactional
public boolean updateDictPq(DictPqParam.UpdateParam updateParam) {
updateParam.setName(updateParam.getName().trim());
checkDicPqName(updateParam, true);
DictPq dictPq = new DictPq();
BeanUtil.copyProperties(updateParam, dictPq);

2
system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java
View File

@@ -59,6 +59,7 @@ public class DictTreeServiceImpl extends ServiceImpl<DictTreeMapper, DictTree> i
@Override
@Transactional
public boolean addDictTree(DictTreeParam dictTreeParam) {
dictTreeParam.setName(dictTreeParam.getName().trim());
checkRepeat(dictTreeParam, false);
boolean result;
DictTree dictTree = new DictTree();
@@ -79,6 +80,7 @@ public class DictTreeServiceImpl extends ServiceImpl<DictTreeMapper, DictTree> i
@Override
@Transactional
public boolean updateDictTree(DictTreeParam.UpdateParam param) {
param.setName(param.getName().trim());
DictTree dictTree = this.getById(param.getId());
if("975f63baeb6f653c54fca226a9ae36ca".equals(param.getId()) || dictTree.getPids().contains("975f63baeb6f653c54fca226a9ae36ca")){
throw new BusinessException(SystemResponseEnum.CAN_NOT_UPDATE_USED_DICT);

2
system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTypeServiceImpl.java
View File

@@ -60,6 +60,7 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, DictType> i
@Override
@Transactional
public boolean addDictType(DictTypeParam dictTypeParam) {
dictTypeParam.setName(dictTypeParam.getName().trim());
checkDicTypeName(dictTypeParam, false);
DictType dictType = new DictType();
BeanUtil.copyProperties(dictTypeParam, dictType);
@@ -71,6 +72,7 @@ public class DictTypeServiceImpl extends ServiceImpl<DictTypeMapper, DictType> i
@Override
@Transactional
public boolean updateDictType(DictTypeParam.UpdateParam updateParam) {
updateParam.setName(updateParam.getName().trim());
checkDicTypeName(updateParam, true);
DictType dictType = new DictType();
BeanUtil.copyProperties(updateParam, dictType);