feat: 品牌字段映射增加启用/禁用开关(is_enabled)；前端增加开关列和行样式；新增6个Repository测试+6个Service/Controller测试；迁移脚本幂等执行

database/sqls/05-field-mapping-is-enabled.sql

@@ -0,0 +1,35 @@
+-- ============================================================
+-- 05: 品牌字段映射增加启用/禁用开关
+-- 执行目标库：cnc_business
+-- 幂等：是（通过 IF NOT EXISTS 检查列是否已存在）
+-- ============================================================
+
+-- 1. 增加 is_enabled 列（默认启用）
+SET @dbname = 'cnc_business';
+SET @tablename = 'cnc_brand_field_mapping';
+SET @columnname = 'is_enabled';
+SET @preparedStatement = (SELECT IF(
+  (
+    SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS
+    WHERE TABLE_SCHEMA = @dbname
+      AND TABLE_NAME = @tablename
+      AND COLUMN_NAME = @columnname
+  ) > 0,
+  'SELECT 1',
+  'ALTER TABLE cnc_brand_field_mapping ADD COLUMN is_enabled tinyint(1) NOT NULL DEFAULT 1 COMMENT ''是否启用：1=启用 0=禁用'' AFTER is_required'
+));
+PREPARE alterIfNotExists FROM @preparedStatement;
+EXECUTE alterIfNotExists;
+DEALLOCATE PREPARE alterIfNotExists;
+
+-- 2. 根据采集示例数据，禁用未出现的字段映射
+--    采集示例中只出现了：_io_status, Tag5, Tag8, Tag9, Tag11, Tag22, Tag23
+--    未出现的先设为禁用，后续可通过后台开关启用
+UPDATE cnc_brand_field_mapping SET is_enabled = 0
+WHERE field_name IN ('Tag14','Tag17','Tag18','Tag19','Tag20','Tag21','Tag24','Tag25','Tag26')
+  AND is_enabled = 1;
+
+-- 3. 验证结果
+SELECT id, standard_field, field_name, is_required, is_enabled
+FROM cnc_brand_field_mapping
+ORDER BY id;

frontend/src/views/brand/BrandEditPage.vue

@@ -13,12 +13,13 @@
     </el-card>
     <el-card shadow="hover">
       <template #header><div style="display:flex;justify-content:space-between"><span>字段映射列表</span><el-button size="small" @click="addMapping">+ 新增映射</el-button></div></template>
-      <el-table :data="form.mappings" border stripe size="small" style="width:100%">
+      <el-table :data="form.mappings" border stripe size="small" style="width:100%" row-class-name="mapping-row" :row-style="({row}) => row.isEnabled === 0 ? { opacity: 0.5 } : {}">
         <el-table-column label="标准字段" min-width="180"><template #default="{row}"><el-select v-model="row.standardField" style="width:100%"><el-option v-for="f in standardFields" :key="f" :label="f" :value="f" /></el-select></template></el-table-column>
         <el-table-column label="字段名" min-width="140"><template #default="{row}"><el-input v-model="row.fieldName" /></template></el-table-column>
         <el-table-column label="匹配方式" min-width="110"><template #default="{row}"><el-select v-model="row.matchBy" style="width:100%"><el-option label="id" value="id" /><el-option label="desc" value="desc" /></el-select></template></el-table-column>
         <el-table-column label="数据类型" min-width="110"><template #default="{row}"><el-select v-model="row.dataType" style="width:100%"><el-option label="string" value="string" /><el-option label="number" value="number" /></el-select></template></el-table-column>
         <el-table-column label="必填" width="60" align="center"><template #default="{row}"><el-checkbox v-model="row.isRequired" :true-value="1" :false-value="0" /></template></el-table-column>
+        <el-table-column label="启用" width="70" align="center"><template #default="{row}"><el-switch v-model="row.isEnabled" :active-value="1" :inactive-value="0" inline-prompt active-text="是" inactive-text="否" /></template></el-table-column>
         <el-table-column label="操作" width="80" align="center"><template #default="{ $index }"><el-button link type="danger" @click="form.mappings.splice($index, 1)">删除</el-button></template></el-table-column>
       </el-table>
     </el-card>
@@ -36,12 +37,12 @@ import request from '@/utils/request'
 const route = useRoute()
 const router = useRouter()
 import type { Brand, ApiResponse } from '@/types'
-type BrandMappingForm = { standardField: string; fieldName: string; matchBy: string; dataType: string; isRequired: number }
+type BrandMappingForm = { standardField: string; fieldName: string; matchBy: string; dataType: string; isRequired: number; isEnabled: number }
 const isEdit = !!route.params.id
 const submitting = ref(false)
 const standardFields = ['program_name','part_count','device_status','run_status','operate_mode','spindle_speed_set','feed_speed_set','spindle_speed_actual','feed_speed_actual','spindle_load','spindle_override','power_on_time','run_time','cutting_time','cycle_time','machining_status']
 const form = reactive({ brandName: '', deviceField: 'device', tagsPath: 'tags', mappings: [] as BrandMappingForm[] })
-function addMapping() { form.mappings.push({ standardField: '', fieldName: '', matchBy: 'id', dataType: 'string', isRequired: 0 }) }
+function addMapping() { form.mappings.push({ standardField: '', fieldName: '', matchBy: 'id', dataType: 'string', isRequired: 0, isEnabled: 1 }) }
 async function loadData() {
   if (!isEdit) return
   const r = await request.get<Brand>(`/admin/brand/${route.params.id}`)

src/CncModels/Dto/Brand/BrandFieldMappingDto.cs

@@ -10,5 +10,7 @@ namespace CncModels.Dto.Brand
         public string MatchBy { get; set; }
         public string DataType { get; set; }
         public int IsRequired { get; set; }
+        
+        public int IsEnabled { get; set; }
     }
 }

src/CncModels/Entity/BrandFieldMapping.cs

@@ -28,6 +28,9 @@ namespace CncModels.Entity
         /// <summary>是否必填</summary>
         public int IsRequired { get; set; }
 
+        /// <summary>是否启用</summary>
+        public int IsEnabled { get; set; }
+
         /// <summary>创建时间</summary>
         public DateTime CreatedAt { get; set; }
     }

src/CncRepository/Impl/BrandFieldMappingRepository.cs

@@ -19,7 +19,7 @@ namespace CncRepository.Impl
         {
             using (var conn = CreateConnection())
             {
-                var sql = @"SELECT id as Id, brand_id as BrandId, standard_field as StandardField, field_name as FieldName, match_by as MatchBy, data_type as DataType, is_required as IsRequired, created_at as CreatedAt 
+                var sql = @"SELECT id as Id, brand_id as BrandId, standard_field as StandardField, field_name as FieldName, match_by as MatchBy, data_type as DataType, is_required as IsRequired, is_enabled as IsEnabled, created_at as CreatedAt 
                              FROM cnc_brand_field_mapping WHERE brand_id = @BrandId ORDER BY id";
                 return conn.Query<BrandFieldMapping>(sql, new { BrandId = brandId }).ToList();
             }
@@ -29,7 +29,7 @@ namespace CncRepository.Impl
         {
             using (var conn = CreateConnection())
             {
-                var sql = @"SELECT id as Id, brand_id as BrandId, standard_field as StandardField, field_name as FieldName, match_by as MatchBy, data_type as DataType, is_required as IsRequired, created_at as CreatedAt 
+                var sql = @"SELECT id as Id, brand_id as BrandId, standard_field as StandardField, field_name as FieldName, match_by as MatchBy, data_type as DataType, is_required as IsRequired, is_enabled as IsEnabled, created_at as CreatedAt 
                              FROM cnc_brand_field_mapping WHERE id = @Id";
                 return conn.QuerySingleOrDefault<BrandFieldMapping>(sql, new { Id = id });
             }
@@ -39,8 +39,8 @@ namespace CncRepository.Impl
         {
             using (var conn = CreateConnection())
             {
-                var sql = @"INSERT INTO cnc_brand_field_mapping (brand_id, standard_field, field_name, match_by, data_type, is_required, created_at) 
+                var sql = @"INSERT INTO cnc_brand_field_mapping (brand_id, standard_field, field_name, match_by, data_type, is_required, is_enabled, created_at) 
-                            VALUES (@BrandId, @StandardField, @FieldName, @MatchBy, @DataType, @IsRequired, @CreatedAt); 
+                            VALUES (@BrandId, @StandardField, @FieldName, @MatchBy, @DataType, @IsRequired, @IsEnabled, @CreatedAt); 
                               SELECT LAST_INSERT_ID();";
                 return conn.QuerySingle<int>(sql, entity);
             }
@@ -50,7 +50,7 @@ namespace CncRepository.Impl
         {
             using (var conn = CreateConnection())
             {
-                var sql = @"UPDATE cnc_brand_field_mapping SET brand_id = @BrandId, standard_field = @StandardField, field_name = @FieldName, match_by = @MatchBy, data_type = @DataType, is_required = @IsRequired, created_at = @CreatedAt WHERE id = @Id";
+                var sql = @"UPDATE cnc_brand_field_mapping SET brand_id = @BrandId, standard_field = @StandardField, field_name = @FieldName, match_by = @MatchBy, data_type = @DataType, is_required = @IsRequired, is_enabled = @IsEnabled, created_at = @CreatedAt WHERE id = @Id";
                 return conn.Execute(sql, entity) > 0;
             }
         }
@@ -74,8 +74,8 @@ namespace CncRepository.Impl
                     try
                     {
                         int count = 0;
-                        var sql = @"INSERT INTO cnc_brand_field_mapping (brand_id, standard_field, field_name, match_by, data_type, is_required, created_at) 
+                                var sql = @"INSERT INTO cnc_brand_field_mapping (brand_id, standard_field, field_name, match_by, data_type, is_required, is_enabled, created_at) 
-                                    VALUES (@BrandId, @StandardField, @FieldName, @MatchBy, @DataType, @IsRequired, @CreatedAt); 
+                                    VALUES (@BrandId, @StandardField, @FieldName, @MatchBy, @DataType, @IsRequired, @IsEnabled, @CreatedAt); 
                                       SELECT LAST_INSERT_ID();";
                         foreach (var m in mappings)
                         {
@@ -94,5 +94,15 @@ namespace CncRepository.Impl
                 }
             }
         }
+
+        public List<BrandFieldMapping> GetEnabledByBrandId(int brandId)
+        {
+            using (var conn = CreateConnection())
+            {
+                var sql = @"SELECT id as Id, brand_id as BrandId, standard_field as StandardField, field_name as FieldName, match_by as MatchBy, data_type as DataType, is_required as IsRequired, is_enabled as IsEnabled, created_at as CreatedAt 
+                            FROM cnc_brand_field_mapping WHERE brand_id = @BrandId AND is_enabled = 1 ORDER BY id";
+                return conn.Query<BrandFieldMapping>(sql, new { BrandId = brandId }).ToList();
+            }
+        }
     }
 }

src/CncRepository/Interface/IBrandFieldMappingRepository.cs

@@ -14,5 +14,6 @@ namespace CncRepository.Interface
         bool Update(BrandFieldMapping entity);
         bool DeleteByBrandId(int brandId);
         int BatchCreate(int brandId, List<BrandFieldMapping> mappings);
+        List<BrandFieldMapping> GetEnabledByBrandId(int brandId);
     }
 }

src/CncService/Impl/BrandService.cs

@@ -62,7 +62,8 @@ namespace CncService.Impl
                         FieldName = m.FieldName,
                         MatchBy = m.MatchBy,
                         DataType = m.DataType,
-                    IsRequired = m.IsRequired
+                    	IsRequired = m.IsRequired,
+                        IsEnabled = m.IsEnabled
                     }).ToList() ?? new List<BrandFieldMappingDto>()
                 };
             return detail;
@@ -147,6 +148,7 @@ namespace CncService.Impl
                         MatchBy = m.MatchBy,
                         DataType = m.DataType,
                         IsRequired = m.IsRequired,
+                        IsEnabled = m.IsEnabled,
                         CreatedAt = DateTime.Now
                     }).ToList();
                 _mappingRepository.BatchCreate(newBrandId, newMappings);

tests/CncRepository.Tests/BrandFieldMappingRepositoryTests.cs

@@ -40,6 +40,8 @@ namespace CncRepository.Tests
         [Fact]
         public void GetEnabledByBrandId_只返回启用的映射()
         {
+            TestDb.Execute(@"INSERT IGNORE INTO cnc_brand (id, brand_name, device_field, tags_path, is_enabled, created_at, updated_at)
+                VALUES (1, 'FANUC', 'device', 'tags', 1, NOW(), NOW())");
             TestDb.Execute(@"INSERT INTO cnc_brand_field_mapping (brand_id, standard_field, field_name, match_by, data_type, is_required, is_enabled, created_at)
                 VALUES (1, 'program_name', 'Tag5', 'id', 'string', 1, 1, NOW()),
                        (1, 'part_count', 'Tag8', 'id', 'number', 1, 1, NOW()),
@@ -52,6 +54,9 @@ namespace CncRepository.Tests
         [Fact]
         public void Create_默认启用()
         {
+            // 确保 brand_id=1 存在
+            TestDb.Execute(@"INSERT IGNORE INTO cnc_brand (id, brand_name, device_field, tags_path, is_enabled, created_at, updated_at)
+                VALUES (1, 'FANUC', 'device', 'tags', 1, NOW(), NOW())");
             var entity = new BrandFieldMapping
             {
                 BrandId = 1,
@@ -85,6 +90,9 @@ namespace CncRepository.Tests
         [Fact]
         public void BatchCreate_批量插入保留启用状态()
         {
+            // 确保 brand_id=1 存在
+            TestDb.Execute(@"INSERT IGNORE INTO cnc_brand (id, brand_name, device_field, tags_path, is_enabled, created_at, updated_at)
+                VALUES (1, 'FANUC', 'device', 'tags', 1, NOW(), NOW())");
             var mappings = new[]
             {
                 new BrandFieldMapping { StandardField = "f1", FieldName = "Tag1", MatchBy = "id", DataType = "string", IsRequired = 0, IsEnabled = 1, CreatedAt = DateTime.Now },