From d80860f28e9b1f2452d9a5a668249884d276454c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Mon, 12 Dec 2022 19:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E5=BA=93=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=AD=98=E5=8E=86=E5=8F=B2Log?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ParamsReportDetailEOServiceImpl.java | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
index 36b095838..0fdfa60e5 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportDetailEOServiceImpl.java
@@ -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();