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-29 10:50:17 +08:00
parent 708b40880e
commit 34f317780e
3 changed files with 5 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java
View File

@@ -10,7 +10,6 @@ import com.njcn.gather.detection.pojo.dto.DevXiNumData;
import com.njcn.gather.detection.pojo.enums.DetectionCodeEnum;
import com.njcn.gather.detection.pojo.enums.SourceOperateCodeEnum;
import com.njcn.gather.detection.pojo.enums.SourceResponseCodeEnum;
import com.njcn.gather.detection.pojo.param.DevPhaseSequenceParam;
import com.njcn.gather.detection.pojo.param.PreDetectionParam;
import com.njcn.gather.detection.pojo.po.DevData;
import com.njcn.gather.detection.pojo.po.IcdCheckData;
@@ -74,8 +73,6 @@ public class SocketDevResponseService {
// ISO 8601格式
private final DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE_TIME;
private DevPhaseSequenceParam devPhaseSequenceParam;
private List<String> dataTypeList;
private List<String> icdTypeList;
@@ -1914,47 +1911,4 @@ public class SocketDevResponseService {
}
}
/**
* 脚本与设备校验
*
* @param param
* @param socketDataMsg
*/
public void scriptToDeviceCheck(PreDetectionParam param, SocketDataMsg socketDataMsg) {
String data = socketDataMsg.getData();
DevData devData = JSON.parseObject(data, DevData.class);
SourceResponseCodeEnum dictDataEnumByCode = SourceResponseCodeEnum.getDictDataEnumByCode(socketDataMsg.getCode());
//SourceIssue sourceIssue = SocketManager.getSourceList().get(0);
switch (Objects.requireNonNull(dictDataEnumByCode)) {
case SUCCESS:
List<String> dataTypeList = new ArrayList<>();
devData.getSqlData().forEach(obj -> {
dataTypeList.add(obj.getDesc());
});
devData.getSqlDataHarm().forEach(obj -> {
dataTypeList.add(obj.getDesc());
});
List<String> dataTypeCopy = new ArrayList<>(devPhaseSequenceParam.getDataType());
dataTypeCopy.removeAll(dataTypeList);
break;
case UNPROCESSED_BUSINESS:
break;
case NORMAL_RESPONSE:
break;
case DEV_ERROR:
break;
case DEV_TARGET:
break;
case RE_OPERATE:
break;
case MESSAGE_PARSING_ERROR:
break;
default:
CnSocketUtil.sendUnSocket(param.getUserPageId());
break;
}
}
}

5
detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java
View File

@@ -1092,7 +1092,10 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
public void visualizeProvinceDev(List<PqDev> pqDevs) {
pqDevs.forEach(pqDev -> {
pqDev.setDevType(devTypeService.getById(pqDev.getDevType()).getName());
pqDev.setManufacturer(dictDataService.getDictDataById(pqDev.getManufacturer()).getName());
if(StrUtil.isNotBlank(pqDev.getManufacturer())){
pqDev.setManufacturer(dictDataService.getDictDataById(pqDev.getManufacturer()).getName());
}
pqDev.setProtocol(dictDataService.getDictDataById(pqDev.getProtocol()).getName());
if (StrUtil.isNotBlank(pqDev.getDelegate())) {
pqDev.setDelegate(dictDataService.getDictDataById(pqDev.getDelegate()).getName());

2
user/src/main/java/com/njcn/gather/user/user/service/impl/SysRoleServiceImpl.java
View File

@@ -101,7 +101,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
@Override
public List<SysRole> simpleList() {
LambdaQueryWrapper<SysRole> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.select(SysRole::getId, SysRole::getName).ne(SysRole::getType, RoleConst.TYPE_SUPER_ADMINISTRATOR).eq(SysRole::getState, DataStateEnum.ENABLE.getCode());
lambdaQueryWrapper.select(SysRole::getId, SysRole::getName).eq(SysRole::getState, DataStateEnum.ENABLE.getCode());
return this.baseMapper.selectList(lambdaQueryWrapper);
}