添加调用规则

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

@@ -17,6 +17,8 @@ import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertCalledMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertCalledService;
 import com.yeejoin.amos.boot.module.jcs.api.vo.AlertCalledVo;
 
+import javax.annotation.Resource;
+
 /**
 * 警情接警记录 服务实现类
 *
@@ -28,7 +30,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
 
 	 @Autowired
 	 RedisUtils redisUtils;
-	 @Autowired
+	 @Resource
 	 AlertCalledMapper alertCalledMapper;
 	 
 	@Autowired
@@ -37,6 +39,8 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
     @Autowired
     private ESAlertCalledService eSAlertCalledService;
 	    
+    @Autowired
+    RuleAlertCalledService ruleAlertCalledService;
 	/**
 	 * 
 	 * <pre>
@@ -58,15 +62,18 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
              alertCalled.setAlertStage(AlertStageEnums.JQJB.getValue());
              alertCalled.setAlarmType(AlertStageEnums.JQGB.getValue());
              alertCalled.setAlarmTypeCode(AlertStageEnums.JQGB.getCode());
-             
+             this.save(alertCalled);
          } else {
              // 警情报送
              // ****************************************************待确认开发
         	  alertCalled.setAlertStage(AlertStageEnums.LLDP.getValue());
         	  alertCalled.setAlarmType(AlertStageEnums.JQCB.getValue());
               alertCalled.setAlarmTypeCode(AlertStageEnums.JQCB.getCode());
+              this.save(alertCalled);
+              //调用规则
+              ruleAlertCalledService.fireAlertCalledRule(alertCalled);
          }
-         this.save(alertCalled);
+        
          // 动态表单
          List<AlertFormValue> alertFormValuelist = alertCalledVo.getAlertFormValue();
          // 填充警情主键