#告警代码合并

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

@@ -6,6 +6,7 @@ import com.hnac.hzinfo.subscribe.HZ3000SoeSubscribe;
 import com.hnac.hzinfo.subscribe.SoeSubscribe;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
+import org.eclipse.paho.client.mqttv3.MqttException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java

@@ -12,7 +12,6 @@ import com.hnac.hzims.equipment.vo.EminfoAndEmParamVo;
 import com.hnac.hzims.operational.config.enume.ConfigStatus;
 import com.hnac.hzims.operational.config.vo.StationRealVo;
 import com.hnac.hzims.operational.main.constant.HomePageConstant;
-import com.hnac.hzims.operational.main.vo.AreaMonthReportVo;
 import com.hnac.hzims.operational.main.vo.RealAttributeVo;
 import com.hnac.hzims.operational.main.vo.RealDeviceVo;
 import com.hnac.hzims.operational.main.vo.RealStationVo;
@@ -35,6 +34,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.*;
+import org.springblade.message.dto.MailPushDto;
+import org.springblade.message.fegin.IPushMsgClient;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
 import org.springframework.beans.factory.annotation.Value;