WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

（控件校验）上报库管理-参数查看-常规导出修改。

Browse Source
This commit is contained in:
wangzhijiang
2023-02-03 15:28:48 +08:00
parent f168d73c38
commit 51945f28c0
2 changed files with 76 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportConfigDataEOServiceImpl.java
+1
View File
@@ -47,6 +47,7 @@ public class ParamsReportConfigDataEOServiceImpl extends ServiceImpl<ParamsRepor
LambdaQueryWrapper<ParamsReportConfigDataEO> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ParamsReportConfigDataEO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ParamsReportConfigDataEO::getParamsConfigId, paramsConfigId); queryWrapper.eq(ParamsReportConfigDataEO::getParamsConfigId, paramsConfigId);
queryWrapper.eq(ParamsReportConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId); queryWrapper.eq(ParamsReportConfigDataEO::getParamsCollectManifestId, paramsCollectManifestId);
queryWrapper.orderByDesc(ParamsReportConfigDataEO::getOrderNum);
return this.list(queryWrapper); return this.list(queryWrapper);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+75 -73
View File
@@ -1311,42 +1311,57 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
if (ControlTypeEnum.Title.getValue().equals(controlType)) { if (ControlTypeEnum.Title.getValue().equals(controlType)) {
record1.put(paramsConfigEO.getId(), titleDefaultValue); record1.put(paramsConfigEO.getId(), titleDefaultValue);
} else { } else {
String paramsConfigId = paramsConfigEO.getId();
ParamsReportConfigDataEO paramsConfigDataEO = paramsReportConfigDataEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
configDataBuilder.append(paramsConfigDataEO.getPullData()).append("#");
}
if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
configDataBuilder.append(paramsConfigDataEO.getTextData()).append("#");
}
if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId());
if (CollectionUtil.isNotEmpty(ossFileList)) {
// 不合并导出时 验证文件名是否相同，相同进一步验证文件内容是否相同，不同时重命名文件
String fileName = ossFileList.get(0).getFileName();
String newFileName = isRepeat(fileListAll, ossFileList.get(0));
if (!"".equals(newFileName) && !"old".equals(newFileName)) { // 文件名称重复 且文件内容不同
configDataBuilder.append(newFileName).append("#");
ossFileList.get(0).setFileName(newFileName);
fileList.addAll(ossFileList);
fileListAll.addAll(ossFileList);
} else if ("old".equals(newFileName)) { // 文件名称重复 且文件内容相同 String paramsConfigId = paramsConfigEO.getId();
configDataBuilder.append(fileName).append("#"); List<ParamsReportConfigDataEO> paramsConfigDataEOList = this.paramsReportConfigDataEOService.queryListByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据
fileList.addAll(ossFileList); StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
}else { if(CollectionUtils.isNotEmpty(paramsConfigDataEOList)){
configDataBuilder.append(fileName).append("#"); for (ParamsReportConfigDataEO paramsConfigDataEO : paramsConfigDataEOList) {
fileList.addAll(ossFileList);
fileListAll.addAll(ossFileList); StringBuilder configDataBuilderTemp = new StringBuilder(); // 重新组合配置数据
if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
configDataBuilderTemp.append(paramsConfigDataEO.getPullData()).append("#");
}
if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
configDataBuilderTemp.append(paramsConfigDataEO.getTextData()).append("#");
}
if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId());
if (CollectionUtil.isNotEmpty(ossFileList)) {
// 不合并导出时 验证文件名是否相同，相同进一步验证文件内容是否相同，不同时重命名文件
String fileName = ossFileList.get(0).getFileName();
String newFileName = isRepeat(fileListAll, ossFileList.get(0));
if (!"".equals(newFileName) && !"old".equals(newFileName)) { // 文件名称重复 且文件内容不同
configDataBuilderTemp.append(newFileName).append("#");
ossFileList.get(0).setFileName(newFileName);
fileList.addAll(ossFileList);
fileListAll.addAll(ossFileList);
} else if ("old".equals(newFileName)) { // 文件名称重复 且文件内容相同
configDataBuilderTemp.append(fileName).append("#");
fileList.addAll(ossFileList);
} else {
configDataBuilderTemp.append(fileName).append("#");
fileList.addAll(ossFileList);
fileListAll.addAll(ossFileList);
}
}
} }
String configData = configDataBuilderTemp.toString();
if (configData.contains("#")) {
configData = configData.substring(0, configData.lastIndexOf("#"));
}
configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
} }
} }
String configData = configDataBuilder.toString(); String configData = configDataBuilder.toString();
if (configData.contains("#")) { if (configData.contains(paramsReportDetailVO.getSeparator())) {
configData = configData.substring(0, configData.lastIndexOf("#")); configData = configData.substring(0, configData.lastIndexOf(paramsReportDetailVO.getSeparator()));
} }
record1.put(paramsConfigEO.getId(), configData); record1.put(paramsConfigEO.getId(), configData);
@@ -1360,66 +1375,53 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
} else { } else {
List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId); List<ParamsReportConfigDataEO> paramsReportConfigDataEOS = paramsReportConfigDataEOService.queryByConfigIdListAndCollectManifestId(configIdList, paramsCollectManifestId);
String textDatas = paramsReportConfigDataEOS.stream().filter(e -> StringUtils.isNotEmpty(e.getTextData())) StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据
.map(ParamsReportConfigDataEO::getTextData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator()));
String pullDatas = paramsReportConfigDataEOS.stream().filter(e -> StringUtils.isNotEmpty(e.getPullData())) for (ParamsReportConfigDataEO paramsConfigDataEO : paramsReportConfigDataEOS) {
.map(ParamsReportConfigDataEO::getPullData).distinct().collect(Collectors.joining(paramsReportDetailVO.getSeparator())); StringBuilder configDataBuilderTemp = new StringBuilder(); // 重新组合配置数据
List<String> fileNameList = new ArrayList<>(); if (StringUtils.isNotEmpty(paramsConfigDataEO.getPullData())) {
for(ParamsReportConfigDataEO paramsReportConfigDataEO : paramsReportConfigDataEOS) { configDataBuilderTemp.append(paramsConfigDataEO.getPullData()).append("#");
if (StringUtils.isNotEmpty(paramsReportConfigDataEO.getFileConnectId())) { }
List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsReportConfigDataEO.getFileConnectId()); if (StringUtils.isNotEmpty(paramsConfigDataEO.getTextData())) {
configDataBuilderTemp.append(paramsConfigDataEO.getTextData()).append("#");
}
if (StringUtils.isNotEmpty(paramsConfigDataEO.getFileConnectId())) {
List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(paramsConfigDataEO.getFileConnectId());
if (CollectionUtil.isNotEmpty(ossFileList)) { if (CollectionUtil.isNotEmpty(ossFileList)) {
// 合并导出时 验证文件名是否相同，相同进一步验证文件内容是否形同，不同时重命名文件 // 不合并导出时 验证文件名是否相同，相同进一步验证文件内容是否相同，不同时重命名文件
String fileName = ossFileList.get(0).getFileName(); String fileName = ossFileList.get(0).getFileName();
String newFileName = isRepeat(fileListAll, ossFileList.get(0)); String newFileName = isRepeat(fileListAll, ossFileList.get(0));
if (!"".equals(newFileName) && !"old".equals(newFileName)) { // 文件名称重复 且文件内容不同 if (!"".equals(newFileName) && !"old".equals(newFileName)) { // 文件名称重复 且文件内容不同
// 判断 新文件名是不是当前参数下 配置间的 重复 configDataBuilderTemp.append(newFileName).append("#");
int count = (int) fileList.stream().filter(e->newFileName.equals(e.getFileName())).count(); ossFileList.get(0).setFileName(newFileName);
if (count <= 0) { // 不是 （如果是，不做任何操作） fileList.addAll(ossFileList);
fileNameList.add(newFileName); fileListAll.addAll(ossFileList);
ossFileList.get(0).setFileName(newFileName);
fileList.addAll(ossFileList);
fileListAll.addAll(ossFileList);
}
} else if ("old".equals(newFileName)) { // 文件名称重复 且文件内容相同 } else if ("old".equals(newFileName)) { // 文件名称重复 且文件内容相同
configDataBuilderTemp.append(fileName).append("#");
// 判断这种重复是不是当前参数下 配置间的 fileList.addAll(ossFileList);
int count = (int) fileList.stream().filter(e->fileName.equals(e.getFileName())).count(); } else {
if (count <= 0) { // 不是 （如果是，不做任何操作） configDataBuilderTemp.append(fileName).append("#");
fileNameList.add(fileName);
fileList.addAll(ossFileList);
fileListAll.addAll(ossFileList);
}
}else { // 文件名称不重复
fileNameList.add(fileName);
fileList.addAll(ossFileList); fileList.addAll(ossFileList);
fileListAll.addAll(ossFileList); fileListAll.addAll(ossFileList);
} }
} }
} }
configData = configDataBuilderTemp.toString();
if (configData.contains("#")) {
configData = configData.substring(0, configData.lastIndexOf("#"));
}
configDataBuilder.append(configData).append(paramsReportDetailVO.getSeparator());
} }
StringBuilder configDataBuilder = new StringBuilder(); // 重新组合配置数据 String configDataStr = configDataBuilder.toString();
if (StringUtils.isNotEmpty(pullDatas)) { if (configDataStr.contains(paramsReportDetailVO.getSeparator())) {
configDataBuilder.append(pullDatas).append("#"); configDataStr = configDataStr.substring(0, configDataStr.lastIndexOf(paramsReportDetailVO.getSeparator()));
} }
if (StringUtils.isNotEmpty(textDatas)) { record1.put("params_value", configDataStr);
configDataBuilder.append(textDatas).append("#");
}
if (CollectionUtil.isNotEmpty(fileNameList)) {
// fileNameList = fileNameList.stream().distinct().collect(Collectors.toList());
configDataBuilder.append(StringUtils.join(fileNameList, paramsReportDetailVO.getSeparator())).append("#");
}
configData = configDataBuilder.toString();
if (configData.contains("#")) {
configData = configData.substring(0, configData.lastIndexOf("#"));
}
record1.put("params_value", configData);
} }
} }