Merge remote-tracking branch 'origin/master'

fengxiang

2018-07-03 b97887d232f865b6a4bf835861aac8a4ebc55c28

 src/main/java/com/moral/service/AlarmConfigService.java

@@ -6,7 +6,13 @@
import java.util.Optional;

public interface AlarmConfigService {
    public Optional<AlarmConfigValue> queryValueByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryValueByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryByOrganizationId(int organizationId);
    public Optional<AlarmConfig> queryByMonitorPointId(int mpId);
    public  AlarmConfigValue getDefaultAlarmConfigValue();

    Optional<AlarmConfig> queryByDeviceMac(String mac);

    void addOrModify(AlarmConfig alarmConfig);

}