Merge remote-tracking branch 'origin/dev_point_task' into develop

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java

@@ -191,6 +191,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();
@@ -235,14 +236,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;
 		}