上报库编辑明细,历史记录中value值加引号。
This commit is contained in:
+20
-19
@@ -1694,7 +1694,8 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
|||||||
|
|
||||||
// 添加配置数据
|
// 添加配置数据
|
||||||
for (Map.Entry<String, Object> entry : map.entrySet()) {
|
for (Map.Entry<String, Object> entry : map.entrySet()) {
|
||||||
if ("id".equals(entry.getKey())) {
|
String key = entry.getKey();
|
||||||
|
if ("id".equals(key)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1732,18 +1733,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
|||||||
if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) {
|
if (type.equals(ConfigDataTypeEnum.TEXT.getValue())) {
|
||||||
paramsReportConfigDataEO.setTextData(dataValue);
|
paramsReportConfigDataEO.setTextData(dataValue);
|
||||||
if (StringUtils.isEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue)) {
|
if (StringUtils.isEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue)) {
|
||||||
logCnContent.append("空").append("改为").append(dataValue).append(",");
|
logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append(",");
|
||||||
logEnContent.append(" from ").append("Null").append(" to ").append(dataValue).append(", ");
|
logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
|
||||||
|
|
||||||
changeFlag = true;
|
changeFlag = true;
|
||||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isEmpty(dataValue)) {
|
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isEmpty(dataValue)) {
|
||||||
logCnContent.append(oldConfigDataEO.getTextData()).append("改为").append("空").append(",");
|
logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append("空").append("\"").append(",");
|
||||||
logEnContent.append(" from ").append(oldConfigDataEO.getTextData()).append(" to ").append("Null").append(", ");
|
logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", ");
|
||||||
|
|
||||||
changeFlag = true;
|
changeFlag = true;
|
||||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getTextData().equals(dataValue)) {
|
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getTextData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getTextData().equals(dataValue)) {
|
||||||
logCnContent.append(oldConfigDataEO.getTextData()).append("改为").append(dataValue).append(",");
|
logCnContent.append("\"").append(oldConfigDataEO.getTextData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append(",");
|
||||||
logEnContent.append(" from ").append(oldConfigDataEO.getTextData()).append(" to ").append(dataValue).append(", ");
|
logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getTextData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
|
||||||
|
|
||||||
changeFlag = true;
|
changeFlag = true;
|
||||||
}
|
}
|
||||||
@@ -1753,18 +1754,18 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
|||||||
paramsReportConfigDataEO.setPullData(dataValue);
|
paramsReportConfigDataEO.setPullData(dataValue);
|
||||||
|
|
||||||
if (StringUtils.isEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue)) {
|
if (StringUtils.isEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue)) {
|
||||||
logCnContent.append("空").append("改为").append(dataValue).append(",");
|
logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(dataValue).append("\"").append(",");
|
||||||
logEnContent.append(" from ").append("Null").append(" to ").append(dataValue).append(", ");
|
logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
|
||||||
|
|
||||||
changeFlag = true;
|
changeFlag = true;
|
||||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isEmpty(dataValue)) {
|
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isEmpty(dataValue)) {
|
||||||
logCnContent.append(oldConfigDataEO.getPullData()).append("改为").append("空").append(",");
|
logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append("空").append("\"").append(",");
|
||||||
logEnContent.append(" from ").append(oldConfigDataEO.getPullData()).append(" to ").append("Null").append(", ");
|
logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", ");
|
||||||
|
|
||||||
changeFlag = true;
|
changeFlag = true;
|
||||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getPullData().equals(dataValue)) {
|
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getPullData()) && StringUtils.isNotEmpty(dataValue) && !oldConfigDataEO.getPullData().equals(dataValue)) {
|
||||||
logCnContent.append(oldConfigDataEO.getPullData()).append("改为").append(dataValue).append(",");
|
logCnContent.append("\"").append(oldConfigDataEO.getPullData()).append("\"").append("改为").append("\"").append(dataValue).append("\"").append(",");
|
||||||
logEnContent.append(" from ").append(oldConfigDataEO.getPullData()).append(" to ").append(dataValue).append(", ");
|
logEnContent.append(" from ").append("\"").append(oldConfigDataEO.getPullData()).append("\"").append(" to ").append("\"").append(dataValue).append("\"").append(", ");
|
||||||
|
|
||||||
changeFlag = true;
|
changeFlag = true;
|
||||||
}
|
}
|
||||||
@@ -1807,21 +1808,21 @@ public class ParamsReportDetailEOServiceImpl extends ServiceImpl<ParamsReportDet
|
|||||||
}
|
}
|
||||||
paramsReportConfigDataEO.setFileConnectId(dataValue);
|
paramsReportConfigDataEO.setFileConnectId(dataValue);
|
||||||
if (StringUtils.isEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) {
|
if (StringUtils.isEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) {
|
||||||
logCnContent.append("空").append("改为").append(newFileNames).append(",");
|
logCnContent.append("\"").append("空").append("\"").append("改为").append("\"").append(newFileNames).append("\"").append(",");
|
||||||
logEnContent.append(" from ").append("Null").append(" to ").append(newFileNames).append(", ");
|
logEnContent.append(" from ").append("\"").append("Null").append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", ");
|
||||||
|
|
||||||
changeFlag = true;
|
changeFlag = true;
|
||||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isEmpty(dataValue)) {
|
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isEmpty(dataValue)) {
|
||||||
String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
||||||
logCnContent.append(oldFileNames).append("改为").append("空").append(",");
|
logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append("空").append("\"").append(",");
|
||||||
logEnContent.append(" from ").append(oldFileNames).append(" to ").append("Null").append(", ");
|
logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append("Null").append("\"").append(", ");
|
||||||
|
|
||||||
changeFlag = true;
|
changeFlag = true;
|
||||||
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) {
|
} else if (StringUtils.isNotEmpty(oldConfigDataEO.getFileConnectId()) && StringUtils.isNotEmpty(dataValue)) {
|
||||||
String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
String oldFileNames = ossFileService.getFileInfosByConnectId(oldConfigDataEO.getFileConnectId()).stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
|
||||||
if (!oldConfigDataEO.getFileConnectId().equals(dataValue)) {
|
if (!oldConfigDataEO.getFileConnectId().equals(dataValue)) {
|
||||||
logCnContent.append(oldFileNames).append("改为").append(newFileNames).append(",");
|
logCnContent.append("\"").append(oldFileNames).append("\"").append("改为").append("\"").append(newFileNames).append("\"").append(",");
|
||||||
logEnContent.append(" from ").append(oldFileNames).append(" to ").append(newFileNames).append(", ");
|
logEnContent.append(" from ").append("\"").append(oldFileNames).append("\"").append(" to ").append("\"").append(newFileNames).append("\"").append(", ");
|
||||||
|
|
||||||
changeFlag = true;
|
changeFlag = true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user