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 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 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