From 82f69e7d0952d6f31db7097446a2a392dae1e89d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 29 Jun 2021 14:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B1=E6=B5=8B=E8=AF=95=E8=BD=AC=E8=BE=BE?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=AF=9D=EF=BC=8C=E6=8A=8Atrue=E3=80=81false?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=90=AF=E7=94=A8=E3=80=81=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/PointRuleServiceImpl.java    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
index 2f0c8fc5ba..04820099d8 100644
--- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
+++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java
@@ -192,6 +192,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 		insertOperateRecord(tokenDTO, entityNew, entityDB, CommonOperateTypeEnum.EDIT.getCode());
 		// 系统日志记录
 		String messages = disposeLog(formDTO, entityDB);
+		log.info("要保存的日志========="+messages);
 		if (StringUtils.isNotBlank(messages)){
 			HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
 			PointRuleChangedMQMsg msg = new PointRuleChangedMQMsg();
@@ -236,14 +237,10 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 			appendStatus = true;
 		}
 		// 规则启用  是否启用 0-否，1-是
-		String status;
-		if (e.getEnabledFlag().equals(NumConstant.ZERO_STR)){
-			status = "false";
-		}else {
-			status = "true";
-		}
-		if(!status.equals(f.getEnabledFlag())){
-			String s = String.format(StrConstant.POINT_CHANGE, "规则启用", f.getEnabledFlag());
+		String webStatus = f.getEnabledFlag().equals("true") ? "启用" : "关闭";
+		String javaStatus = e.getEnabledFlag().equals(NumConstant.ONE_STR) ? "启用" : "关闭";
+		if(!webStatus.equals(javaStatus)){
+			String s = String.format(StrConstant.POINT_CHANGE, "规则启用", webStatus);
 			sb.append(s).append("，");
 			appendStatus = true;
 		}