3 Commits (a7881ff7d08a1b94eb50596ed25bb4b5794fdd12)

Author	SHA1	Message	Date
821644@qq.com	a7881ff7d0	Fix AlarmService.cs duplicate definitions ... - 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)	3 weeks ago
821644@qq.com	aa3c532725	Fix compilation errors and repository duplicate definitions ... - 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)	4 weeks ago
821644@qq.com	47c26fa125	完成CNC机床数据采集分析系统核心功能开发 ... 主要完成： - 完善数据模型层：添加告警、统计、认证、数据采集等模型 - 实现数据访问层：通用仓储、设备、模板、生产、用户、系统等仓储 - 完善核心业务服务：设备采集、产量统计、告警管理、模板配置、系统配置、日志服务 - 实现中间件和过滤器：异常处理、日志、跨域、统一响应格式 - 实现实时通信服务：WebSocket通信、连接管理、消息推送 - 完善API控制器：设备、生产、告警、模板、系统等接口 - 添加单元测试：核心服务测试用例 实现的关键功能： - 设备数据采集和解析服务 - 产量统计计算（差分算法） - 多品牌模板配置管理 - 告警管理和通知 - 实时数据推送 - 系统配置管理 - 日志记录和管理	4 weeks ago