jcl
/
haoliang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27 Commits
1 Branch
0 Tags
65 MiB
main
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '304b7760c8'
${ noResults }
Commit Graph

4 Commits (304b7760c8f897a1aabdde5f42197aa78a524fd6)

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 816621dcb9 Continue fixing compilation errors after .NET 8 upgrade 
- Fix CNCBusinessDbContext: remove BaseEntity/charset references, fix UseMySql ServerVersion
- Add missing DbSets to CNCDbContext (Employees, DeviceAssignments, Roles, TemplateFieldMappings, ProductionSummaries)
- Fix LogEntry model to use LogLevel enum instead of string Level property
- Fix LogRepository to use correct property names (Level, Timestamp, Id)
- Fix CollectionRepository LogLevel comparisons (remove .ToString())
- Fix ProductionRepository to use ProductionRecordBasic
- Fix ProductionSummaryRepository decimal conversions
- Fix ScheduledTaskRepository TaskStatus ambiguity with full namespace qualification
- Fix ScheduledTaskRepository ExecuteTaskAsync to use proper query
- Fix SystemRepository decimal division (alarms.Count to alarms.Count())
- Exclude Migrations folder from build (uses legacy EF Core 6.0 API)

Note: Haoliang.Core project still has many errors due to namespace mismatches
and duplicate class definitions - needs significant architectural review.
 4 weeks ago
821644@qq.com c3d17cebb9 Continue fixing compilation errors after .NET 8 upgrade 
- Fixed CNCDbContext type references in repositories
- Fixed ambiguous TagData and DeviceCurrentStatus references
- Added missing using statements to repository files
- Updated DataCollection namespace references

Note: There are still remaining DbContext/model mismatches that need to be resolved
 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