Merge branch 'dev_upgrade' of http://172.16.10.76/station/YeeAmosFireAutoSysRoot into dev_upgrade

YeeAmosFireAutoSysCommon/src/main/java/com/yeejoin/amos/fas/dao/entity/MessageRo.java

+package com.yeejoin.amos.fas.dao.entity;
+
+import java.util.Date;
+
+import com.yeejoin.amos.fas.core.common.request.DateUtil;
+
+/**
+ * 
+ * <pre>
+ * RO基础信息
+ * </pre>
+ *
+ * @author amos
+ * @version $Id: BasicsRo.java, v 0.1 2019年5月22日 上午10:44:22 amos Exp $
+ */
+public class MessageRo extends BusinessEntity
+{
+
+
+	//TODO 添加批次号字段
+
+
+
+	/**
+	 * 批次号，标记规则执行批次
+	 */
+	private String batchNo;
+
+	/**
+	 * 所要执行的规则包id
+	 */
+	private String packageId;
+
+
+	/**
+	 * <pre>
+	 * 
+	 * </pre>
+	 */
+	private static final long serialVersionUID = -2678718393223476996L;
+	/**
+	 * id
+	 */
+	private String id;
+	/**
+     * 当前时间
+     */
+    private Date dateTime = DateUtil.getNow();
+    /**
+     * 当前时间
+     */
+	private String currTime;
+    
+	public String getId()
+	{
+		return id;
+	}
+	public void setId(String id)
+	{
+		this.id = id;
+	}
+	public Date getDateTime()
+	{
+		if (dateTime == null)
+		{
+			return DateUtil.getNow();
+		}
+		return dateTime;
+	}
+	public void setDateTime(Date dateTime)
+	{
+		this.dateTime = dateTime;
+	}
+	public String getCurrTime()
+	{
+		if (currTime == null)
+		{
+			return DateUtil.getDateTimeFormat(dateTime);
+		}
+		return currTime;
+	}
+	public void setCurrTime(String currTime)
+	{
+		this.currTime = currTime;
+	}
+
+
+	public String getBatchNo() {
+		return batchNo;
+	}
+
+	public void setBatchNo(String batchNo) {
+		this.batchNo = batchNo;
+	}
+
+
+	public String getPackageId() {
+		return packageId;
+	}
+
+	public void setPackageId(String packageId) {
+		this.packageId = packageId;
+	}
+}
\ No newline at end of file

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

@@ -14,10 +14,11 @@ import com.yeejoin.amos.fas.business.action.result.ActionResult;
 import com.yeejoin.amos.fas.business.action.result.TipResult;
 import com.yeejoin.amos.fas.business.action.result.message.ActionResultMessage;
 import com.yeejoin.amos.fas.business.action.util.DataItemUtil;
-import com.yeejoin.amos.fas.business.service.model.BasicsRo;
+import com.yeejoin.amos.fas.business.service.intfc.IMessageService;
 import com.yeejoin.amos.fas.business.service.model.ToipResponse;
 import com.yeejoin.amos.fas.dao.entity.BusinessEntity;
 import com.yeejoin.amos.fas.dao.entity.Message;
+import com.yeejoin.amos.fas.dao.entity.MessageRo;
 /**
  * 
  * <pre>
@@ -30,71 +31,73 @@ import com.yeejoin.amos.fas.dao.entity.Message;
 @Component
 public class SimpleTipAction implements CustomerAction
 {
-	private static String PACKAGEURL = "com.yeejoin.amos.rule.map.action.result.message.";
-//	@Autowired
-//	private IMessageService messageService;
+	private static String PACKAGEURL = "com.yeejoin.amos.fas.business.action.result.message.";
+	
+	@Autowired
+	private IMessageService messageService;
 
 	//@ExposeAction("消息提示")
-//	public void sendMessageTip(Object bizobj, String title, String content,String type)
-//	{
-//
-//		try
-//		{
-//
-//			ELEvaluationContext.setVariable("bizobj",bizobj);
-//			TipResult result = new TipResult();
-//			result.add(bizobj);
-//			Map<String, Object> tempmap1 = new HashMap<>();
-//			tempmap1.put("title", title);
-//			result.add(tempmap1);
-//			Map<String, Object> tempmap2 = new HashMap<>();
-//			content =DataItemUtil.getNative(content);
-//			tempmap2.put("content", content);
-//			result.add(tempmap2);
-//
-//
-//			Constructor<?> constructor;
-//
-//			constructor = Class.forName(
-//					PACKAGEURL + result.getClass().getSimpleName() + "Message")
-//					.getConstructor(ActionResult.class);
-//			ActionResultMessage<?> action = (ActionResultMessage<?>) constructor.newInstance(result);
-//			String firstStr = "fromws";
-//			String secondStr = "global";
-//			String thirdStr = "msg";
-//			result.setBizObj((BusinessEntity)bizobj);
-//			Object obj = action.execute(firstStr, secondStr, thirdStr);
-//			result.setToipResponse((ToipResponse) obj);
-//			saveMessageAction(result,type);
-//		}
-//		catch (Exception e)
-//		{
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-//	}
+	public void sendMessageTip(Object bizobj, String title, String content,String type)
+	{
+
+		try
+		{
+
+			ELEvaluationContext.setVariable("bizobj",bizobj);
+			TipResult result = new TipResult();
+			result.add(bizobj);
+			Map<String, Object> tempmap1 = new HashMap<>();
+			tempmap1.put("title", title);
+			result.add(tempmap1);
+			Map<String, Object> tempmap2 = new HashMap<>();
+			content =DataItemUtil.getNative(content);
+			tempmap2.put("content", content);
+			result.add(tempmap2);
+
+
+			Constructor<?> constructor;
+
+			constructor = Class.forName(
+					PACKAGEURL + result.getClass().getSimpleName() + "Message")
+					.getConstructor(ActionResult.class);
+			ActionResultMessage<?> action = (ActionResultMessage<?>) constructor.newInstance(result);
+			String firstStr = "fromws";
+			String secondStr = "global";
+			String thirdStr = "msg";
+			result.setBizObj((BusinessEntity)bizobj);
+			Object obj = action.execute(firstStr, secondStr, thirdStr);
+			result.setToipResponse((ToipResponse) obj);
+			saveMessageAction(result,type);
+		}
+		catch (Exception e)
+		{
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
 	
-//	@SuppressWarnings("unchecked")
-//	private void saveMessageAction(AbstractActionResult abstractActionResult,String type)
-//	{
-//		Message message = new Message();
-//		List<Map<String, Object>> list = (List<Map<String, Object>>) abstractActionResult.getData();
-//		for(Map<String, Object> map : list) {
-//			for(String str: map.keySet()) {
-//				if(str.equals("content")) {
-//					message.setContent(map.get("content").toString());
-//				}else 
-//					if (str.equals("title"))
-//					{
-//						message.setTitle(map.get("title").toString());
-//					}
-//			}
-//			BasicsRo basicsRo = (BasicsRo)abstractActionResult.getToipResponse().getBizObj();
-//			message.setTime(basicsRo.getDateTime());
-//			message.setBizId(basicsRo.getId());
-//			message.setBizclassName(abstractActionResult.getToipResponse().getBizObj().getClass().toString());
-//			message.setType(type);
-//			messageService.save(message);
-//		}
-//	}
+	@SuppressWarnings("unchecked")
+	private void saveMessageAction(AbstractActionResult abstractActionResult,String type)
+	{
+		Message message = new Message();
+		List<Map<String, Object>> list = (List<Map<String, Object>>) abstractActionResult.getData();
+		for(Map<String, Object> map : list) {
+			for(String str: map.keySet()) {
+				if(str.equals("content")) {
+					message.setContent(map.get("content").toString());
+				}else 
+					if (str.equals("title"))
+					{
+						message.setTitle(map.get("title").toString());
+					}
+			}
+			MessageRo messageRo = (MessageRo)abstractActionResult.getToipResponse().getBizObj();
+			message.setTime(messageRo.getCreateDate());
+			//目前获取不到id
+			message.setBizId(messageRo.getId());
+			message.setBizclassName(abstractActionResult.getToipResponse().getBizObj().getClass().toString());
+			message.setType(type);
+			messageService.save(message);
+		}
+	}
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IContingencyOriginalDataDao.java

@@ -25,6 +25,12 @@ public interface IContingencyOriginalDataDao  extends BaseDao<ContingencyOrigina
     @Modifying(clearAutomatically = true)
     @Query(value = "update contingency_original_data c set c.confirm = ?1,c.runstep=?2 ,c.step_state=?3 where c.batch_No = ?4",nativeQuery = true)
     int updateByButton(String confirm,Boolean runstep,String stepState,String batchNo);
+    
+
+    @Transactional
+    @Modifying(clearAutomatically = true)
+    @Query(value = "update contingency_original_data c set c.step = ?1 where c.batch_No = ?2",nativeQuery = true)
+    int updateByButtonStep(String step,String batchNo);
 
 
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/repository/IMessageDao.java

+package com.yeejoin.amos.fas.business.dao.repository;
+
+import com.yeejoin.amos.fas.dao.entity.ContingencyOriginalData;
+
+public interface IMessageDao extends BaseDao<ContingencyOriginalData, String> {
+
+}

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

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

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

@@ -7,6 +7,7 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
+import com.yeejoin.amos.component.rule.RuleTrigger;
 import com.yeejoin.amos.fas.business.bo.*;
 import com.yeejoin.amos.fas.business.constants.FasConstant;
 import com.yeejoin.amos.fas.business.dao.mapper.*;
@@ -40,6 +41,8 @@ import com.yeejoin.amos.fas.dao.entity.*;
 import com.yeejoin.amos.fas.exception.YeeException;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+
+import org.apache.commons.lang3.ArrayUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -147,6 +150,9 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
     private IDictDao dictDao;
     @Autowired
     private RedisTemplate redisTemplate;
+    
+    @Autowired
+    private RuleTrigger ruleTrigger;
 
     @Autowired
     private FmeaEquipmentPointMapper fmeaEquipmentPointMapper;
@@ -485,7 +491,7 @@ public class RiskSourceServiceImpl implements IRiskSourceService {
         }
         
         //Object result = remoteRuleServer.fireRuleFlow(contingencyRo, equipment.getReservePlan(), equipment.getName());
-//      ruleTrigger.publish(contingencyRo, equipment.getReservePlan());
+        ruleTrigger.publish(contingencyRo, equipment.getReservePlan(),ArrayUtils.toArray( equipment.getName()));
         ContingencyOriginalData contingencyOriginalData = new ContingencyOriginalData();
         BeanUtils.copyProperties(contingencyRo, contingencyOriginalData);
         iContingencyOriginalDataDao.save(contingencyOriginalData);

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IContingencyInstance.java

 package com.yeejoin.amos.fas.business.service.intfc;
 
+import java.util.List;
+
+import com.yeejoin.amos.fas.dao.entity.ContingencyPlanInstance;
+
 public interface IContingencyInstance {
-//
-//    ContingencyPlanInstance createInstanceRecord(String instanceNo, String category, String subCategory, String content, String recordType, String icon);
-//
-//
-//
-//    List<ContingencyPlanInstance> queryForTimeLine(String instanceNo,String recordType) throws Exception;
-//
-//
-//    void setButtonExecuted(String batchNo,String contingencyPlanId,String code,String buttonState) throws Exception;
-//    void setButtonWait(String batchNo,String contingencyPlanId,String buttonState) throws Exception;
-//
-//
-//    void fire(String batchNo,String stepCode, String contingencyPlanId, String buttonCode,String buttonState,String stepStateOnbutton) throws Exception;
-//
-//    void updateStep(String step, String batchNo);
+
+    ContingencyPlanInstance createInstanceRecord(String instanceNo, String category, String subCategory, String content, String recordType, String icon);
+
+
+
+    List<ContingencyPlanInstance> queryForTimeLine(String instanceNo,String recordType) throws Exception;
+
+
+    void setButtonExecuted(String batchNo,String contingencyPlanId,String code,String buttonState) throws Exception;
+    void setButtonWait(String batchNo,String contingencyPlanId,String buttonState) throws Exception;
+
+
+    void fire(String batchNo,String stepCode, String contingencyPlanId, String buttonCode,String buttonState,String stepStateOnbutton) throws Exception;
+
+    void updateStep(String step, String batchNo);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IMessageService.java

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