- Rewrote AlarmService.cs to only contain IAlarmService and AlarmManager
- Removed duplicate AlarmRuleService, AlarmNotificationService definitions
- Removed duplicate IEmailService, ISmsService, IWechatService, IAlarmRuleRepository, IAlarmNotificationRepository
Note: Haoliang.Core still has many errors due to:
- Duplicate class definitions in SystemService.cs, TemplateService.cs, TemplateValidationService.cs, ServiceInfrastructure.cs
- Missing types (DeviceState, NotificationChannel, etc.)
- Ambiguous type references (TagData, DeviceCurrentStatus)
- Fixed duplicate repository definitions by removing separate files and keeping only main definitions
- Fixed IRepository SaveAsync method return type to match BaseRepository (Task<int>)
- Removed duplicate using statements and resolved type conflicts
- Fixed DeviceStatus enum issue in DbContext (changed to string property)
- Added missing LogEntry and TagMapping models
- Fixed TaskStatus naming conflicts in ScheduledTaskRepository
- Resolved duplicate ConversionRule class definition
- Fixed CNCDbContext references to use correct model namespaces
- Updated CNCBusinessDbContext to include missing TaskExecutionResults DbSet
- Build now succeeds with only warnings (no errors)
- Add comprehensive production statistics engine with advanced analytics,
forecasting, and OEE calculations
- Implement real-time WebSocket streaming for live device monitoring and alerts
- Build cache management service with multi-layer caching strategies
- Create device state machine with automatic validation and recovery
- Add statistics and configuration API controllers with full CRUD operations
- Implement business rules engine with dynamic expression evaluation
- Add comprehensive test coverage for all new services and controllers
- Update project dependencies and DI container configuration
- Add system configuration models and comprehensive error handling
This completes the core functionality for the CNC data collection system
supporting 100+ devices with real-time monitoring and analytics capabilities.
821644@qq.com