#告警修改

hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmConfigEntity.java

@@ -24,7 +24,4 @@ public class AlarmConfigEntity extends TenantEntity {
 
 	@ApiModelProperty(value = "站点名称")
 	private String stationName;
-
-	@ApiModelProperty(value = "是否启用 ：0-启用  1-不启用")
-	private Integer isEnable;
 }

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigServiceImpl.java

@@ -103,8 +103,7 @@ public class AlarmConfigServiceImpl extends BaseServiceImpl<AlarmConfigMapper, A
     @Override
     public AlarmHandleMarkVo mark(String code, Integer source,Integer type) {
         AlarmConfigEntity config = this.getOne(Wrappers.<AlarmConfigEntity>lambdaQuery()
-                .eq(AlarmConfigEntity::getStationId,code)
+                .eq(AlarmConfigEntity::getStationId,code));
-                .eq(AlarmConfigEntity::getIsEnable,"0"));
         if(ObjectUtil.isEmpty(config)){
             return detailService.defaultMark(source,type);
         }

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfig.java

@@ -43,7 +43,7 @@ public class MqttConfig {
 //    private String mqtt_system_topname;
     @PostConstruct
     public void registerMqtt(){
-        try {
+
             com.hnac.hzinfo.subscribe.MqttConfig mqttConfig = new com.hnac.hzinfo.subscribe.MqttConfig();
             mqttConfig.setUrl(mqtt_fdp_url);
             mqttConfig.setGroup(mqtt_fdp_group);