Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/RuleAlertCalledService.java

@@ -2,9 +2,12 @@ package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertCalledRo;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
+import com.yeejoin.amos.boot.module.jcs.api.vo.AlertCalledVo;
 import com.yeejoin.amos.component.rule.RuleTrigger;
 
 /**
@@ -32,8 +35,13 @@ public class RuleAlertCalledService {
      * @return
      * @throws Exception
      */
-    public Boolean fireAlertCalledRule(AlertCalled alertCalled) throws Exception 
+    public Boolean fireAlertCalledRule(AlertCalledVo alertCalledVo) throws Exception 
     {
+    	AlertCalled alertCalled = alertCalledVo.getAlertCalled();
+    	if (ValidationUtil.isEmpty(alertCalled))
+		{
+    		throw new BadRequest("参数校验失败.");
+		}
     	//构建警情报送规则对象
     	AlertCalledRo alertCalledRo = new AlertCalledRo();
     	alertCalledRo.setSequenceNbr(alertCalled.getSequenceNbr());