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

上报库修改数据，存历史Log逻辑修改。

Browse Source
This commit is contained in:
高嵩
2022-12-12 19:44:53 +08:00
parent 69e5e572b3
commit d80860f28e
1 changed files with 27 additions and 1 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/ParamsReportDetailEOServiceImpl.java
+27 -1
View File
@@ -1680,6 +1680,10 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
StringBuilder logEnContent = new StringBuilder();
logCnContent.append(loginUser.getUsername()).append("将");
logEnContent.append(loginUser.getUsername()).append(" set ");
// 变更标识
boolean changeFlag = false;
// 添加配置数据
for (Map.Entry<String, Object> entry : map.entrySet()) {
if ("id".equals(entry.getKey())) {
@@ -1723,14 +1727,17 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
logCnContent.append("空").append("改为").append(dataValue).append("，");
logEnContent.append(" from ").append("Null").append(" to ").append(dataValue).append(", ");
changeFlag = true;
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isEmpty(dataValue)) {
logCnContent.append(oldConfigDataEO.getTextData()).append("改为").append("空").append("，");
logEnContent.append(" from ").append(oldConfigDataEO.getTextData()).append(" to ").append("Null").append(", ");
changeFlag = true;
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getTextData().equals(dataValue)) {
logCnContent.append(oldConfigDataEO.getTextData()).append("改为").append(dataValue).append("，");
logEnContent.append(" from ").append(oldConfigDataEO.getTextData()).append(" to ").append(dataValue).append(", ");
changeFlag = true;
}
} else if (type.equals(ConfigDataTypeEnum.PULL.getValue())
@@ -1741,14 +1748,17 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
logCnContent.append("空").append("改为").append(dataValue).append("，");
logEnContent.append(" from ").append("Null").append(" to ").append(dataValue).append(", ");
changeFlag = true;
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isEmpty(dataValue)) {
logCnContent.append(oldConfigDataEO.getPullData()).append("改为").append("空").append("，");
logEnContent.append(" from ").append(oldConfigDataEO.getPullData()).append(" to ").append("Null").append(", ");
changeFlag = true;
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getPullData().equals(dataValue)) {
logCnContent.append(oldConfigDataEO.getPullData()).append("改为").append(dataValue).append("，");
logEnContent.append(" from ").append(oldConfigDataEO.getPullData()).append(" to ").append(dataValue).append(", ");
changeFlag = true;
}
} else if (type.equals(ConfigDataTypeEnum.FILE.getValue())) {
@@ -1792,16 +1802,20 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
logCnContent.append("空").append("改为").append(newFileNames).append("，");
logEnContent.append(" from ").append("Null").append(" to ").append(newFileNames).append(", ");
changeFlag = true;
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isEmpty(dataValue)) {
String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
logCnContent.append(oldFileNames).append("改为").append("空").append("，");
logEnContent.append(" from ").append(oldFileNames).append(" to ").append("Null").append(", ");
changeFlag = true;
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) {
String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
if (!oldConfigDataEO.getFileConnectId().equals(dataValue)) {
logCnContent.append(oldFileNames).append("改为").append(newFileNames).append("，");
logEnContent.append(" from ").append(oldFileNames).append(" to ").append(newFileNames).append(", ");
changeFlag = true;
}
}
@@ -1813,7 +1827,19 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
}
ParamsReportDetailLogEO insertLogEO = new ParamsReportDetailLogEO();
if (logCnContent.toString().endsWith("，")) {
/*if (logCnContent.toString().endsWith("，")) {
String ramarks = "";
if(map.get("remarks") != null){
ramarks = map.get("remarks").toString();
}
insertLogEO.setLogCnContent(logCnContent.toString().substring(0, logCnContent.lastIndexOf("，")));
insertLogEO.setLogEnContent(logEnContent.toString().substring(0, logEnContent.lastIndexOf(",")));
insertLogEO.setParamsReportId(paramsManifestId);
insertLogEO.setParamsReportDetailId(paramsCollectManifestId);
insertLogEO.setRemarks(ramarks);
insertLogEOList.add(insertLogEO);
}*/
if(changeFlag){
String ramarks = "";
if(map.get("remarks") != null){
ramarks = map.get("remarks").toString();