diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmConfigEntity.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmConfigEntity.java index 7022fa3..bf85187 100644 --- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/entity/AlarmConfigEntity.java +++ b/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; } \ No newline at end of file diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigServiceImpl.java index 9b553cd..b2c012a 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/config/service/impl/AlarmConfigServiceImpl.java @@ -103,8 +103,7 @@ public class AlarmConfigServiceImpl extends BaseServiceImpllambdaQuery() - .eq(AlarmConfigEntity::getStationId,code) - .eq(AlarmConfigEntity::getIsEnable,"0")); + .eq(AlarmConfigEntity::getStationId,code)); if(ObjectUtil.isEmpty(config)){ return detailService.defaultMark(source,type); } diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfig.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfig.java index 860785f..8065100 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/mqtt/MqttConfig.java +++ b/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);