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

认证-参数项收集-参考列导入导出处理

Browse Source
This commit is contained in:
liyawei
2022-12-08 09:32:46 +08:00
parent 449657bf13
commit 4013ba302f
2 changed files with 103 additions and 41 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/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+102 -40
View File
@@ -1116,7 +1116,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
map.put("flag", true); // 标识
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
String[] references = projectName.split("-");
map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + onlCgformField.getDbFieldTxt());//字段中文名
map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldTxt());//字段中文名
}
} else {
@@ -1129,7 +1129,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
map.put("flag", true); // 标识
map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName));
String[] references = projectName.split("-");
map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + onlCgformField.getDbFieldEnName());//字段中文名
map.put("db_field_txt", references[0] + "-" + references[1] + "-" + paramsManifestEO.getReferencesColName() + " " + onlCgformField.getDbFieldEnName());//字段中文名
}
} else {
@@ -3362,6 +3362,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
private String[] getWorkbookTitleForExportDre(ParamsCollectManifestVO paramsCollectManifestVO) {
String cut = paramsCollectManifestVO.getCut();
String paramsManifestId = paramsCollectManifestVO.getParamsManifestId();
ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.PARAMS_COLLECT_MANIFEST.getValue());
@@ -3373,9 +3374,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
for (int i = 0; i < fieldList.size(); i++) {
OnlCgformField onlCgformField = fieldList.get(i);
String dbFieldName = onlCgformField.getDbFieldName();
if ("references_col".equals(dbFieldName) && StringUtils.isEmpty(paramsManifestEO.getReferencesColName())) {
continue;
}
if ("nio_number".equals(dbFieldName) || "params_name".equals(dbFieldName) || "description".equals(dbFieldName)
|| "control_type".equals(dbFieldName) || "control_verify".equals(dbFieldName) || "control_values".equals(dbFieldName)
|| "is_must".equals(dbFieldName)) {
|| "is_must".equals(dbFieldName) || "references_col".equals(dbFieldName)) {
dbFieldList.add(dbFieldName);
if(CutEnum.CN.getValue().equals(cut)){
@@ -3573,6 +3577,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
}};
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
ParamsManifestEO paramsManifestEO = paramsManifestEOService.getById(paramsManifestId);
ParamsCollectManifestEO paramsCollectManifestEO = new ParamsCollectManifestEO();
BeanUtils.copyProperties(paramsCollectManifestVO, paramsCollectManifestEO);
@@ -3620,6 +3625,32 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
record1.put("control_type", controlTypeMap.get(controlType));
record1.put("control_verify", controlVerifyMap.get(controlVerify));
// 处理参考列，没引用过则不显示该列
if (StringUtils.isNotEmpty(paramsManifestEO.getReferencesColName())) {
List<String> referencesColList = Arrays.asList(collectManifestEO.getReferencesCol().split("#"));
StringBuilder referencesColBuilder = new StringBuilder();
if (!" ".equals(referencesColList.get(0))) {
referencesColBuilder.append(referencesColList.get(0)).append("#");
}
if (!" ".equals(referencesColList.get(1))) {
referencesColBuilder.append(referencesColList.get(1).replaceAll(",", "！")).append("#");
}
if (!" ".equals(referencesColList.get(2))) {
List<OSSFile> ossFileList = ossFileService.getFileInfosByConnectId(referencesColList.get(2));
if (CollectionUtil.isNotEmpty(ossFileList)) {
referencesColBuilder.append(nioNumber).append("/").append(ossFileList.get(0).getFileName()).append("#");
}
}
String referencesCol = referencesColBuilder.toString();
if (referencesCol.endsWith("#")) {
referencesCol = referencesCol.substring(0, referencesCol.lastIndexOf("#"));
}
record1.put("references_col", referencesCol);
} else {
record1.remove("references_col");
}
// 配置列
if (CollectionUtil.isNotEmpty(paramsConfigEOList)) {
List<OSSFile> fileList = new ArrayList<>();
@@ -4214,7 +4245,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
if ("nio_number".equals(key) || "params_name".equals(key) || "description".equals(key)
|| "control_type".equals(key) || "control_verify".equals(key) || "control_values".equals(key)
|| "is_must".equals(key)) {
|| "is_must".equals(key) || "references_col".equals(key)) {
continue;
}
//
@@ -5001,51 +5032,78 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
// 添加配置数据
for (Map.Entry<String, Object> entry : map.entrySet()) {
StringBuilder referncesColBuilder = new StringBuilder();
ParamsConfigDataEO paramsConfigDataEO = new ParamsConfigDataEO();
if ("id".equals(entry.getKey())) {
continue;
}
// 取值
Map<String, Object> paramsConfigDataMap = (Map<String, Object>) entry.getValue();
String controlType = (String) paramsConfigDataMap.get("controlType");
// 无法转ParamsConfigDataVO（遍历会出现该异常 ： LinkedHashMap cannot be cast to ParamsConfigDataVO）
List<Map<String, Object>> paramsConfigDataVOList = (List<Map<String, Object>>) paramsConfigDataMap.get("list");
if (CollectionUtil.isNotEmpty(paramsConfigDataVOList)) {
for (Map<String, Object> paramsConfigDataVO : paramsConfigDataVOList) {
String type = (String) paramsConfigDataVO.get("type");
String dataValue = (String) paramsConfigDataVO.get("dataValue");
// TEXT
List<Map<String, Object>> textList = paramsConfigDataVOList.stream()
.filter(e->e.get("type").equals(ConfigDataTypeEnum.TEXT.getValue())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(textList)) {
String dataValue = (String) textList.get(0).get("dataValue");
if (StringUtils.isNotEmpty(dataValue)) {
referncesColBuilder.append(dataValue).append("#");
} else {
referncesColBuilder.append(" ").append("#");
}
} else {
referncesColBuilder.append(" ").append("#");
}
if (type.equals(ConfigDataTypeEnum.FILE.getValue())) {
if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件
// 处理文件connectId
String[] fileIdList = dataValue.split(",");
// PULL
List<Map<String, Object>> pullList = paramsConfigDataVOList.stream()
.filter(e->e.get("type").equals(ConfigDataTypeEnum.PULL.getValue())
|| e.get("type").equals(ConfigDataTypeEnum.PULL_MORE.getValue())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(pullList)) {
String dataValue = (String) pullList.get(0).get("dataValue");
if (StringUtils.isNotEmpty(dataValue)) {
referncesColBuilder.append(dataValue).append("#");
} else {
referncesColBuilder.append(" ").append("#");
}
} else {
referncesColBuilder.append(" ").append("#");
}
// FILE
List<Map<String, Object>> fileList = paramsConfigDataVOList.stream()
.filter(e->e.get("type").equals(ConfigDataTypeEnum.FILE.getValue())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(fileList)) {
String dataValue = (String) fileList.get(0).get("dataValue");
if (StringUtils.isNotEmpty(dataValue) && dataValue.contains(",")) { // 新加多个文件
// 处理文件connectId
String[] fileIdList = dataValue.split(",");
String connectId = UUID.randomUUID().toString().replace("-", "");
List<OSSFile> updateFileList = new ArrayList<>();
for (int i = 0; i < fileIdList.length; i++) {
OSSFile ossFile = new OSSFile();
ossFile.setId(fileIdList[i]);
ossFile.setConnectId(connectId);
updateFileList.add(ossFile);
}
ossFileService.updateBatchById(updateFileList);
dataValue = connectId;
} else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) {
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(dataValue);
if (CollectionUtil.isEmpty(ossFiles)) { // 新加了一个文件
String connectId = UUID.randomUUID().toString().replace("-", "");
List<OSSFile> updateFileList = new ArrayList<>();
for (int i = 0; i < fileIdList.length; i++) {
//修改文件表关联信息connect_id
List<OSSFile> oSSFileList = new ArrayList<>();
for (String fileId : dataValue.split(",")) {
OSSFile ossFile = new OSSFile();
ossFile.setId(fileIdList[i]);
ossFile.setId(fileId);
ossFile.setConnectId(connectId);
updateFileList.add(ossFile);
oSSFileList.add(ossFile);
}
ossFileService.updateBatchById(updateFileList);
ossFileService.updateFileInfo(oSSFileList);
dataValue = connectId;
} else if (StringUtils.isNotEmpty(dataValue) && !dataValue.contains(",")) {
List<OSSFile> ossFiles = ossFileService.getFileInfosByConnectId(dataValue);
if(CollectionUtil.isEmpty(ossFiles)){ // 新加了一个文件
String connectId = UUID.randomUUID().toString().replace("-", "");
//修改文件表关联信息connect_id
List<OSSFile> oSSFileList = new ArrayList<>();
for (String fileId : dataValue.split(",")) {
OSSFile ossFile = new OSSFile();
ossFile.setId(fileId);
ossFile.setConnectId(connectId);
oSSFileList.add(ossFile);
}
ossFileService.updateFileInfo(oSSFileList);
dataValue = connectId;
}
}
}
if (StringUtils.isNotEmpty(dataValue)) {
@@ -5053,15 +5111,19 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
} else {
referncesColBuilder.append(" ").append("#");
}
} else {
referncesColBuilder.append(" ").append("#");
}
String referencesCol = referncesColBuilder.toString();
if (StringUtils.isNotEmpty(referencesCol)) {
ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
updateEO.setId(paramsCollectManifestId);
updateEO.setReferencesCol(referencesCol);
updateEOList.add(updateEO);
}
}
String referencesCol = referncesColBuilder.toString();
if (StringUtils.isNotEmpty(referencesCol)) {
ParamsCollectManifestEO updateEO = new ParamsCollectManifestEO();
updateEO.setId(paramsCollectManifestId);
updateEO.setReferencesCol(referencesCol);
updateEOList.add(updateEO);
}
}