6 Commits (3ed43adcb30dfc33d9ca9446bda90c8e5f64ecdb)

Author SHA1 Message Date
821644@qq.com ade24d7a9b 修复编译错误,完成.NET 8.0升级
主要修复内容:
1. RealTimeController: 修复IEnumerable<int>转List<int>及Count方法问题
2. ConfigController: 修复BusinessRuleConfig命名空间歧义问题
3. ConfigController: 修复BusinessRule/StatisticsRule类型转换问题
4. ConfigController: 修复ImportConfigurationAsync参数类型问题
5. TemplateController: 修复ApiResponse.Error方法调用问题
6. IServices: 同步BusinessRule属性与BusinessRuleConfig一致
7. ApiResponse: 添加支持错误详情列表的重载方法
8. Models: 添加CNCDevice.TemplateId和CNCBrandTemplate.DeviceId别名属性
3 weeks ago
821644@qq.com 371a5857c3 Upgrade project from .NET 6.0 to .NET 8.0
- Updated all project files to target net8.0
- Updated Microsoft.EntityFrameworkCore to 8.0.2
- Updated Pomelo.EntityFrameworkCore.MySql to 8.0.2
- Updated Microsoft.Extensions.* packages to 8.0.0
- Updated System.IdentityModel.Tokens.Jwt to 7.0.3
- Updated xunit and related packages to latest versions
- Updated Microsoft.NET.Test.Sdk to 17.8.0
- Added .NET 8.0 SDK installation
4 weeks ago
821644@qq.com 11efc0d1b9 Fix Entity Framework version conflicts and type ambiguities
- Unified all packages to use EF Core 7.0.2
- Fixed ambiguous DeviceCurrentStatus references in CNCDbContext
- Added missing DataCollection namespace reference
- Resolved package version conflicts across all projects
- Fixed repository using statements to include Haoliang.Data.Entities
4 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 f53ba60b8b feat: Complete CNC machine data collection system implementation
- 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.
4 weeks ago
821644@qq.com f90cbd7209 Initial commit: Complete .NET6 CNC machine data collection and analysis system
- Created standard .NET6 project structure with Haoliang.Api, Haoliang.Core, Haoliang.Data, Haoliang.Models, and Haoliang.Tests
- Implemented device management API with Entity Framework Core and MySQL
- Added production calculation logic for CNC machine output statistics
- Created comprehensive data models for devices, templates, production records, users, and system
- Implemented repository pattern for data access
- Added comprehensive test coverage for models and production logic
- Fixed version compatibility issues with Pomelo.EntityFrameworkCore.MySql and Microsoft.AspNetCore.Cors
4 weeks ago