Merge branch 'dev_rule' into 'dev_upgrade'

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/BubbleTipAction.java

@@ -23,7 +23,7 @@ import com.yeejoin.amos.fas.business.service.model.ToipResponse;
 @Component
 public class BubbleTipAction implements CustomerAction
 {
-	private static String PACKAGEURL = "com.yeejoin.amos.rule.map.action.result.message.";
+	private static String PACKAGEURL = "com.yeejoin.amos.fas.business.action.result.message.";
 	
 	//@ExposeAction("气泡提示")
 	public void sendBubbleTip(Object bizobj, Boolean showInfo, Object title, String type)

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/RiskSituationAction.java

@@ -22,7 +22,7 @@ import com.yeejoin.amos.fas.business.service.model.ToipResponse;
 @Component
 public class RiskSituationAction implements CustomerAction
 {
-	private static String PACKAGEURL = "com.yeejoin.amos.rule.map.action.result.message.";
+	private static String PACKAGEURL = "com.yeejoin.amos.fas.business.action.result.message.";
 	
 	//@ExposeAction("气泡提示")
 	public void sendBubbleTip(Object bizobj, Boolean showInfo, String title)

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/SimpleTipAction.java

@@ -92,8 +92,7 @@ public class SimpleTipAction implements CustomerAction
 					}
 			}
 			MessageRo messageRo = (MessageRo)abstractActionResult.getToipResponse().getBizObj();
-			message.setTime(messageRo.getCreateDate());
-			//目前获取不到id
+			message.setTime(messageRo.getDateTime());
 			message.setBizId(messageRo.getId());
 			message.setBizclassName(abstractActionResult.getToipResponse().getBizObj().getClass().toString());
 			message.setType(type);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/MessageMapper.java

+package com.yeejoin.amos.fas.business.dao.mapper;
+
+import java.util.List;
+
+import com.yeejoin.amos.fas.dao.entity.Message;
+
+public interface MessageMapper extends BaseMapper {
+	
+	void save(Message msg);
+	
+	List<Message> findMessageByBizId(String bizId);
+
+}

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/MessageServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import org.springframework.stereotype.Service;
 
+import com.yeejoin.amos.fas.business.dao.mapper.MessageMapper;
 import com.yeejoin.amos.fas.business.service.intfc.IMessageService;
 import com.yeejoin.amos.fas.dao.entity.Message;
 
@@ -11,18 +12,16 @@ import com.yeejoin.amos.fas.dao.entity.Message;
 
 @Service
 public class MessageServiceImpl  implements IMessageService  {
-	//MessageMapper messageMapper;
+	
+	MessageMapper messageMapper;
 		
 	@Override
 	public List<Message> findMessageByBizId(String bizId) {
-		return null;
-		// TODO Auto-generated method stub
-		// messageRepository.findMessageByBizId(bizId);
+		return messageMapper.findMessageByBizId(bizId);
 	}
 
 	@Override
 	public void save(Message msg) {
-		// TODO Auto-generated method stub
-		
+		messageMapper.save(msg);
 	}
 }

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_message.xml

+<?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.fas.business.dao.mapper.MessageMapper">
+	<select id="findMessageByBizId" resultType="com.yeejoin.amos.fas.dao.entity.Message" >
+		SELECT
+		id,
+		time,
+		title,
+		content,
+		type,
+		sender,
+		receiver,
+		reader,
+		biz_id AS bizId,
+		bizclass_name AS bizclassName, 
+		create_date AS createDate,
+		create_user AS createUser,
+		update_date AS updateDate,
+		update_user AS updateUser,
+		is_delete AS isDelete
+		FROM toip_sys_message WHERE biz_id=#{bizId}
+		
+	</select>
+	
+	<insert id="save" >
+		INSERT INTO toip_sys_message id,time,title,content,type,sender,receiver,reader,biz_id,bizclass_name 
+		VALUES(#{id},#{time},#{title},#{content},#{type},#{sender},#{receiver},#{reader},#{bizId},#{bizclassName})	
+	</insert>
+</mapper>
\ No newline at end of file