气瓶预警消息

amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/action/CylWarningMsgAction.java

@@ -65,9 +65,9 @@ public class CylWarningMsgAction{
 		msgLog.setRelationCode(cylWarningMsgDto.getCylSeq());
 		msgLog.setMsgType(EarlyWarningLevelEnum.getEumByLevel(level).getCode());
 		msgLog.setMsgTypeName(EarlyWarningLevelEnum.getEumByLevel(level).getName());
-		msgLog.setBody(text);
-		msgLog.setTargetCode(phone);
-		msgLog.setTargetName(orgUserName);
+		msgLog.setBody(instedParams(text,cylWarningMsgDto));
+		msgLog.setTargetCode(instedParams(phone,cylWarningMsgDto));
+		msgLog.setTargetName(instedParams(orgUserName,cylWarningMsgDto));
 		msgLog.setTerminalType("WEB");
 		msgLog.setSendTime(new Date());
 		msgLogServiceImpl.save(msgLog);
@@ -93,9 +93,9 @@ public class CylWarningMsgAction{
 		msgLog.setRelationCode(cylWarningMsgDto.getCylSeq());
 		msgLog.setMsgType(EarlyWarningLevelEnum.getEumByLevel(level).getCode());
 		msgLog.setMsgTypeName(EarlyWarningLevelEnum.getEumByLevel(level).getName());
-		msgLog.setBody(text);
-		msgLog.setTargetCode(phone);
-		msgLog.setTargetName(orgUserName);
+		msgLog.setBody(instedParams(text,cylWarningMsgDto));
+		msgLog.setTargetCode(instedParams(phone,cylWarningMsgDto));
+		msgLog.setTargetName(instedParams(orgUserName,cylWarningMsgDto));
 		msgLog.setTerminalType("APP");
 		msgLog.setSendTime(new Date());
 		msgLogServiceImpl.save(msgLog);
@@ -120,7 +120,9 @@ public class CylWarningMsgAction{
 //        Map<String, String> strengthMap = this.getStrengthMap(contingencyRo);
 //        for (String key : strengthMap.keySet())
 //            content = content.replaceAll("\\$\\{" + key + "}", strengthMap.get(key));
-
+    	if(null == content || !content.contains("$")) {
+    		return content;
+    	}
           Field[] fields = contingencyRo.getClass().getDeclaredFields();
           Method getMethod = null;
           try {
@@ -130,7 +132,7 @@ public class CylWarningMsgAction{
                   String fileNameInMethod = String.valueOf(field.getName().charAt(0)).toUpperCase() + field.getName().substring(1);
                   getMethod = contingencyRo.getClass().getMethod("get" + fileNameInMethod);
                   String value = String.valueOf(getMethod.invoke(contingencyRo));
-                  content = content.replaceAll("\\$\\{" + field.getName() + "}", value);
+                  content = content.replaceAll("\\$\\{" + field.getName() + "}", value.equals("null")?"":value);
               }
 
               content = getNative(content);