修改bug

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

@@ -328,12 +328,13 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 				ruleAlertCalledService.fireAlertCalledRule(alertCalledObjsDto);
 				// 通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
 				emqKeeper.getMqttClient().publish(topic, "0".getBytes(), RuleConfig.DEFAULT_QOS, true);
-			}
-
 				/**
 				 * 同步保存ES
 				 */
 				eSAlertCalledService.saveAlertCalledToES(alertCalled);
+			}
+
+
 
 			return alertCalledObjsDto;
 		} catch (Exception e) {

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

@@ -81,6 +81,7 @@ public class ESAlertCalledService {
         Date date=new Date(currentTime);
 
         wrapper.ge("call_time", date);
+        wrapper.isNull("father_alert");
 
         List<AlertCalled> alertCalleds = alertCalledService.list(wrapper);
         if (!ValidationUtil.isEmpty(alertCalleds))