巡检消息提醒bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/MessageServiceImpl.java

@@ -371,8 +371,6 @@ public class MessageServiceImpl implements IMessageService {
 				//
 				Msg msg = new Msg();
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss");
-				String start = sdf.format(notice.getFixedTime());
-				msg.setBody(notice.getBody()+"\r\n发送时间:"+start);
 				msg.setIsImmediately(isImmediately);
 				msg.setMsgType(MsgTypeEnum.NOTIFY.getCode());
 				msg.setOrgCode(notice.getOrgCode());
@@ -383,12 +381,15 @@ public class MessageServiceImpl implements IMessageService {
 				msg.setBizOrgCode(notice.getBizOrgCode());
 				msg.setBizOrgName(notice.getBizOrgName());
 
-				if (isImmediately) { //立即发送
+				if (!isImmediately) { //立即发送 false 为立即发送，true为定时发送
+					String start = sdf.format(new Date());
+					msg.setBody(notice.getBody() + "\r\n发送时间:" + start);
 					msg = pushMsgAndSave( toke, product, appKey,msg);
 				} else { //定时发送
 					msg.setStatus(0);
 					msg.setFixedTime(notice.getFixedTime());
-
+					String start = sdf.format(notice.getFixedTime());
+					msg.setBody(notice.getBody() + "\r\n发送时间:" + start);
 					iMsgDao.save(msg);
 					msgList.add(msg);
 				}