修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -59,7 +59,9 @@
             and  a.alert_type_code = #{par.alertTypeCode}
         </if>
 
-
+        <if test='par.alertId==null'>
+            and a.sequence_nbr =#{par.alertId}
+        </if>
         <if test='par.whether24!=false'>
             and a.call_time &gt;= (NOW() - interval 24 hour)
         </if>

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

@@ -124,6 +124,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 	
 	@Value("${mqtt.topic.command.alert.notice}")
 	private String topic;
+
+	@Value("${mqtt.topic.command.alert.noticeData}")
+	private String topicData;
+
+
 	@Value("${redis.cache.failure.time}")
 	private long time;
 	@Value("${mqtt.topic.command.power.deployment}")
@@ -394,6 +399,15 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto, AlertCal
 						null, null, null);
 				// 通知实战指挥页面发送mqtt 默认发送 String 类型 0, 新警情 1 警情状态变化
 				emqKeeper.getMqttClient().publish(topic, "0".getBytes(), RuleConfig.DEFAULT_QOS, true);
+
+				//tuisongxinjingqing
+				RequestData par=new RequestData();
+				par.setAlertId(alertCalled.getSequenceNbr());
+				List<AlertCalledZhDto> list = this.alertCalledListByAlertStatus(null, null, par);
+
+				String json=list!=null&&list.size()>0?JSONObject.toJSONString(list.get(0)):"";
+				emqKeeper.getMqttClient().publish(topicData, json.getBytes(), RuleConfig.DEFAULT_QOS, true);
+
 				/**
 				 * 同步保存ES
 				 */

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

@@ -27,6 +27,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.WordConverterUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
+import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
 import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
@@ -154,6 +155,9 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
     private RuleTrigger ruleTrigger;
 
 
+    @Value("${mqtt.topic.command.alert.noticeJa}")
+    private String topicJa;
+
     private final String msgType = "jcs119";
 
     @Override
@@ -482,6 +486,19 @@ public class AlertSubmittedServiceImpl extends BaseService<AlertSubmittedDto, Al
 
             alertCalledAction.sendAlertCalleCmd(sCode, mobiles, smsParams);
         }
+
+        //警情結案推送
+        if(alertWay.equals(AlertBusinessTypeEnum.警情结案.getCode())) {
+            RequestData par=new RequestData();
+            par.setAlertId(alertCalled.getSequenceNbr());
+            List<AlertCalledZhDto> list = alertCalledService.alertCalledListByAlertStatus(null, null, par);
+
+            String json=list!=null&&list.size()>0?JSONObject.toJSONString(list.get(0)):"";
+            emqKeeper.getMqttClient().publish(topicJa, json.getBytes(), RuleConfig.DEFAULT_QOS, true);
+        }
+
+
+
         emqKeeper.getMqttClient().publish(topic, alertCalledId.getBytes(), RuleConfig.DEFAULT_QOS, false);
     }
 

amos-boot-system-jcs/src/main/resources/application.properties

@@ -58,6 +58,10 @@ mqtt.topic.alert.reporting=alertReporting
 ## 实战指挥新警情主题
 mqtt.topic.command.alert.notice=alertNotice
 
+mqtt.topic.command.alert.noticeData=alertNoticeData
+
+mqtt.topic.command.alert.noticeJa=alertNoticeJa
+
 ## 跑马灯地震、天气预警信息
 mqtt.topic.command.meteorological.notice=meteorological