From c78e3be98226fe05d3be2b45f307bf3d56806cea Mon Sep 17 00:00:00 2001
From: wanxiaoli <wanxiaoli123>
Date: Fri, 20 Mar 2026 18:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A8=E7=90=86=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yfd/business/css/service/DeviceInferService.java |  8 ++++++--
 .../css/service/impl/ModelTrainServiceImpl.java      | 12 ++++++------
 .../src/main/resources/application-business.yml      | 11 ++++++-----
 .../main/resources/{logback.xml => logback.xml.bak}  |  0
 4 files changed, 18 insertions(+), 13 deletions(-)
 rename framework/src/main/resources/{logback.xml => logback.xml.bak} (100%)

diff --git a/business-css/src/main/java/com/yfd/business/css/service/DeviceInferService.java b/business-css/src/main/java/com/yfd/business/css/service/DeviceInferService.java
index 317af6e..ee94be9 100644
--- a/business-css/src/main/java/com/yfd/business/css/service/DeviceInferService.java
+++ b/business-css/src/main/java/com/yfd/business/css/service/DeviceInferService.java
@@ -2,8 +2,10 @@ package com.yfd.business.css.service;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.yfd.business.css.domain.Scenario;
 import com.yfd.business.css.domain.ScenarioResult;
+import com.yfd.business.css.domain.AlgorithmModel;
 import com.yfd.business.css.model.DeviceStepInfo;
 import com.yfd.business.css.model.InferRequest;
 import com.yfd.business.css.model.InferResponse;
@@ -121,15 +123,17 @@ public class DeviceInferService {
                     String modelRelPath = model.getModelPath();
                     log.debug("modelRelPath={}", modelRelPath);
 
-                    // 解析模型的特征映射（feature_map_snapshot）以进行特征过滤
+                    // 解析模型的特征映射（feature_map_snapshot），优先以 input_cols 为准进行特征过滤
                     List<String> requiredFeatures = new ArrayList<>();
                     if (model.getFeatureMapSnapshot() != null && !model.getFeatureMapSnapshot().isBlank()) {
                         try {
-                            // 解析 {"features": ["diameter", "height", ...]} 或者直接是一个 List
                             JsonNode fNode = objectMapper.readTree(model.getFeatureMapSnapshot());
                             if (fNode.isArray()) {
                                 for (JsonNode node : fNode) requiredFeatures.add(node.asText());
+                            } else if (fNode.has("input_cols") && fNode.get("input_cols").isArray()) {
+                                for (JsonNode node : fNode.get("input_cols")) requiredFeatures.add(node.asText());
                             } else if (fNode.has("features") && fNode.get("features").isArray()) {
+                                // 兼容旧版本
                                 for (JsonNode node : fNode.get("features")) requiredFeatures.add(node.asText());
                             }
                         } catch (Exception e) {
diff --git a/business-css/src/main/java/com/yfd/business/css/service/impl/ModelTrainServiceImpl.java b/business-css/src/main/java/com/yfd/business/css/service/impl/ModelTrainServiceImpl.java
index 22f19fc..0963ad6 100644
--- a/business-css/src/main/java/com/yfd/business/css/service/impl/ModelTrainServiceImpl.java
+++ b/business-css/src/main/java/com/yfd/business/css/service/impl/ModelTrainServiceImpl.java
@@ -41,10 +41,10 @@ import java.util.regex.Pattern;
 @Service
 public class ModelTrainServiceImpl extends ServiceImpl<ModelTrainTaskMapper, ModelTrainTask> implements ModelTrainService {
 
-    @Value("${file-space.upload-path:./data/uploads/}")
+    @Value("${file-space.dataset-path:D:/keff_dataSpace/datasets/}")
     private String uploadPath;
 
-    @Value("${file-space.model-path:E:/python_coding/keffCenter/models/}")
+    @Value("${file-space.model-path:D:/keff_dataSpace/models/}")
     private String modelPath;
     
     @Value("${python.api.url:http://localhost:8000}")
@@ -373,7 +373,7 @@ public class ModelTrainServiceImpl extends ServiceImpl<ModelTrainTaskMapper, Mod
                         Path extraFileSrc = srcDir.resolve(fileName);
                         if (Files.exists(extraFileSrc) && Files.isRegularFile(extraFileSrc)) {
                             Path dest = versionDir.resolve(fileName).normalize();
-                            Files.copy(extraFileSrc, dest, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
+                            Files.copy(extraFileSrc, dest, StandardCopyOption.REPLACE_EXISTING);
                         }
                     }
                 }
@@ -466,11 +466,11 @@ public class ModelTrainServiceImpl extends ServiceImpl<ModelTrainTaskMapper, Mod
                 // 如果文件已存在，由于这是在发布新版本目录下，正常不应存在。
                 // 如果是重复点击或有历史遗留，这里选择覆盖，或者可以跳过/报错。
                 // 为了避免 "目标文件已存在" 报错中断流程，这里改为 REPLACE_EXISTING
-                Files.copy(src, dest, StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.COPY_ATTRIBUTES);
+                Files.copy(src, dest, StandardCopyOption.REPLACE_EXISTING);
             } else {
-                Files.copy(src, dest, StandardCopyOption.COPY_ATTRIBUTES);
+                Files.copy(src, dest);
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             throw new BizException("复制文件失败: " + e.getMessage());
         }
 
diff --git a/business-css/src/main/resources/application-business.yml b/business-css/src/main/resources/application-business.yml
index 74a28bf..4bc54b0 100644
--- a/business-css/src/main/resources/application-business.yml
+++ b/business-css/src/main/resources/application-business.yml
@@ -25,11 +25,12 @@ file-space:
 security:
   dev:
     permit: true
-logging:
-  file:
-    name: logs/business-css.log
-  level:
-    root: INFO
+# 注释掉这里的 file.name，由 logback-spring.xml 接管，防止覆盖
+# logging:
+#   file:
+#     name: logs/business-css.log
+#   level:
+#     root: INFO
 
 python:
   api:
diff --git a/framework/src/main/resources/logback.xml b/framework/src/main/resources/logback.xml.bak
similarity index 100%
rename from framework/src/main/resources/logback.xml
rename to framework/src/main/resources/logback.xml.bak