Merge branch 'dev_rule' into 'dev_upgrade'

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/service/impl/RiskSourceServiceImpl.java

@@ -485,7 +485,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);