From 7f84de7d2b40772d532fc9c3a3062e937081320b Mon Sep 17 00:00:00 2001 From: gulongcheng <474084054@qq.com> Date: Fri, 17 Oct 2025 16:44:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ModelTraningController.java | 27 +++++++ .../com/sdm/data/service/IModelService.java | 11 +++ .../data/service/impl/ModelServiceImpl.java | 81 +++++++++++++++++++ .../src/main/resources/application-dev.yml | 4 +- .../src/main/resources/application-local.yml | 4 +- .../src/main/resources/application-prod.yml | 4 +- gateway2/src/main/resources/application.yml | 2 +- .../project/service/impl/NodeServiceImpl.java | 35 ++++++-- .../resources/mapper/SimulationNodeMapper.xml | 72 ++++++++--------- 9 files changed, 191 insertions(+), 49 deletions(-) create mode 100644 data/src/main/java/com/sdm/data/controller/ModelTraningController.java create mode 100644 data/src/main/java/com/sdm/data/service/IModelService.java create mode 100644 data/src/main/java/com/sdm/data/service/impl/ModelServiceImpl.java diff --git a/data/src/main/java/com/sdm/data/controller/ModelTraningController.java b/data/src/main/java/com/sdm/data/controller/ModelTraningController.java new file mode 100644 index 00000000..f79fa4c1 --- /dev/null +++ b/data/src/main/java/com/sdm/data/controller/ModelTraningController.java @@ -0,0 +1,27 @@ +package com.sdm.data.controller; + +import com.sdm.data.service.IModelService; +import io.swagger.v3.oas.annotations.Operation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 模型训练控制器 + */ +@RestController +@RequestMapping("/modelTraning") +public class ModelTraningController { + @Autowired + private IModelService modelService; + + /** + * 调用python脚本处理导入数据 + */ + @GetMapping("/handleLoadData") + @Operation(summary = "调用python脚本处理导入数据", description = "调用python脚本处理导入数据") + public void handleLoadData(Integer fileId, String localFilePath, String pythonScriptPath, String paramJsonPath) { + modelService.handleLoadData(fileId, localFilePath, pythonScriptPath,paramJsonPath ); + } +} diff --git a/data/src/main/java/com/sdm/data/service/IModelService.java b/data/src/main/java/com/sdm/data/service/IModelService.java new file mode 100644 index 00000000..05f5d67d --- /dev/null +++ b/data/src/main/java/com/sdm/data/service/IModelService.java @@ -0,0 +1,11 @@ +package com.sdm.data.service; + +/** + * 模型训练服务接口 + */ +public interface IModelService { + /** + * 调用python脚本处理导入数据 + */ + void handleLoadData(Integer fileId, String localFilePath, String pythonScriptPath, String paramJsonPath); +} diff --git a/data/src/main/java/com/sdm/data/service/impl/ModelServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/ModelServiceImpl.java new file mode 100644 index 00000000..ff9da58d --- /dev/null +++ b/data/src/main/java/com/sdm/data/service/impl/ModelServiceImpl.java @@ -0,0 +1,81 @@ +package com.sdm.data.service.impl; + +import com.sdm.data.service.IDataFileService; +import com.sdm.data.service.IModelService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.*; +import java.io.FileOutputStream; +import java.io.OutputStream; + +@Service +@Slf4j +public class ModelServiceImpl implements IModelService { + @Autowired + IDataFileService dataFileService; + + @Override + public void handleLoadData(Integer fileId, String localFilePath, String pythonScriptPath,String paramJsonPath) { + try { + // 从MinIO下载文件到本地路径 + downloadFromMinIO(fileId,localFilePath); + callPythonScript(pythonScriptPath, paramJsonPath); + } catch (Exception e) { + log.error("调用python脚本处理导入数据", e); + throw new RuntimeException(e); + } + } + + private void downloadFromMinIO(Integer fileId, String localFilePath) { + try { + InputStream in = dataFileService.getMinioInputStream(fileId); + OutputStream out = new FileOutputStream(localFilePath); + // 将输入流写入本地文件 + byte[] buffer = new byte[1024]; + int len; + while ((len = in.read(buffer)) != -1) { + out.write(buffer, 0, len); + } + } catch (IOException e) { + log.error("下载文件到本地失败", e); + throw new RuntimeException(e); + } + } + + public void callPythonScript(String pythonScriptPath, String paramJsonPath) throws IOException, InterruptedException { + try { + // 构建执行 Python 脚本的命令 + ProcessBuilder processBuilder = new ProcessBuilder( + "python3", + pythonScriptPath, + paramJsonPath + ); + + // 重定向进程的输入、输出流，便于查看执行日志 + processBuilder.redirectErrorStream(true); + Process process = processBuilder.start(); + + // 读取 Python 脚本的输出 + try (BufferedReader reader = new BufferedReader( + new InputStreamReader(process.getInputStream()))) { + String line; + while ((line = reader.readLine()) != null) { + System.out.println(line); + } + } + + // 等待 Python 脚本执行完成，并获取退出码 + int exitCode = process.waitFor(); + if (exitCode == 0) { + System.out.println("Python 脚本执行成功"); + } else { + System.out.println("Python 脚本执行失败，退出码: " + exitCode); + } + } catch (Exception e) { + log.error("调用Python脚本失败", e); + throw new RuntimeException(e); + } + } +} diff --git a/gateway2/src/main/resources/application-dev.yml b/gateway2/src/main/resources/application-dev.yml index 4ae0b766..cfd1cb68 100644 --- a/gateway2/src/main/resources/application-dev.yml +++ b/gateway2/src/main/resources/application-dev.yml @@ -16,8 +16,8 @@ spring: enabled: true gateway: httpclient: - connect-timeout: 5000 - response-timeout: 5000 + connect-timeout: 10000 + response-timeout: 10000 routes: - id: approve-service uri: lb://approve diff --git a/gateway2/src/main/resources/application-local.yml b/gateway2/src/main/resources/application-local.yml index 2588877b..6cf1b879 100644 --- a/gateway2/src/main/resources/application-local.yml +++ b/gateway2/src/main/resources/application-local.yml @@ -16,8 +16,8 @@ spring: enabled: true gateway: httpclient: - connect-timeout: 5000 - response-timeout: 5000 + connect-timeout: 10000 + response-timeout: 10000 routes: - id: approve-service uri: lb://approve diff --git a/gateway2/src/main/resources/application-prod.yml b/gateway2/src/main/resources/application-prod.yml index 4ae0b766..cfd1cb68 100644 --- a/gateway2/src/main/resources/application-prod.yml +++ b/gateway2/src/main/resources/application-prod.yml @@ -16,8 +16,8 @@ spring: enabled: true gateway: httpclient: - connect-timeout: 5000 - response-timeout: 5000 + connect-timeout: 10000 + response-timeout: 10000 routes: - id: approve-service uri: lb://approve diff --git a/gateway2/src/main/resources/application.yml b/gateway2/src/main/resources/application.yml index 83ccd4b8..b09ec360 100644 --- a/gateway2/src/main/resources/application.yml +++ b/gateway2/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: local + active: dev main: web-application-type: reactive cloud: diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java index 42d5185c..cfd8deee 100644 --- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java @@ -727,11 +727,15 @@ public class NodeServiceImpl extends ServiceImpl userStatisticsMap = new HashMap<>(); + // 所有任务执行状态 + Set allExeStatus = new HashSet<>(); // 统计每个用户的各种状态任务数量 for (UserGroupTaskCompleteVo item : userGroupTaskCompleteStatistics) { Integer userId = item.getUserId(); String exeStatus = item.getExeStatus(); + allExeStatus.add(exeStatus); + UserGroupTaskCompleteStatisticsVo userStat = userStatisticsMap.getOrDefault(userId, new UserGroupTaskCompleteStatisticsVo()); userStat.setUserId(userId); userStat.setUserName(item.getNickname()); @@ -750,8 +754,10 @@ public class NodeServiceImpl extends ServiceImpl result = new ArrayList<>(userStatisticsMap.values()); - - return SdmResponse.success(result); + JSONObject resultResponse = new JSONObject(); + resultResponse.put("allExeStatus", allExeStatus); + resultResponse.put("result", result); + return SdmResponse.success(resultResponse); } @Override @@ -761,10 +767,14 @@ public class NodeServiceImpl extends ServiceImpl userStatisticsMap = new HashMap<>(); + // 所有难度值 + Set alldifficultyValue = new HashSet<>(); + // 统计每个用户的各种状态任务数量 for (UserGroupDifficultyVo item : userGroupDifficultyStatistics) { Integer userId = item.getUserId(); Float difficulty = item.getDifficulty(); + alldifficultyValue.add(difficulty); UserGroupDifficultyStatisticsVo userStat = userStatisticsMap.getOrDefault(userId, new UserGroupDifficultyStatisticsVo()); userStat.setUserId(userId); @@ -784,12 +794,17 @@ public class NodeServiceImpl extends ServiceImpl result = new ArrayList<>(userStatisticsMap.values()); - - return SdmResponse.success(result); + JSONObject resultResponse = new JSONObject(); + resultResponse.put("alldifficultyValue", alldifficultyValue); + resultResponse.put("result", result); + return SdmResponse.success(resultResponse); } @Override public SdmResponse getCommonCompleteStatistics(CommonGetCompleteStatisticsReq req) { + // 所有任务执行状态 + Set allExeStatus = new HashSet<>(); + if ("task".equals(req.getQueryType())) { // 处理任务完成情况统计 List commonCompleteStatisticsFromTask = this.baseMapper.getCommonCompleteStatisticsFromTask(req); @@ -811,13 +826,17 @@ public class NodeServiceImpl extends ServiceImpl taskResult = new ArrayList<>(taskStatisticsMap.values()); - return SdmResponse.success(taskResult); + JSONObject resultResponse = new JSONObject(); + resultResponse.put("allExeStatus", allExeStatus); + resultResponse.put("result", taskResult); + return SdmResponse.success(resultResponse); } else if ("performance".equals(req.getQueryType())) { // 处理指标完成情况统计 List commonCompleteStatisticsFromPerformance = this.baseMapper.getCommonCompleteStatisticsFromPerformance(req); @@ -839,6 +858,7 @@ public class NodeServiceImpl extends ServiceImpl performanceResult = new ArrayList<>(performanceStatisticsMap.values()); - return SdmResponse.success(performanceResult); + JSONObject resultResponse = new JSONObject(); + resultResponse.put("allExeStatus", allExeStatus); + resultResponse.put("result", performanceResult); + return SdmResponse.success(resultResponse); } return SdmResponse.success(new ArrayList<>()); } diff --git a/project/src/main/resources/mapper/SimulationNodeMapper.xml b/project/src/main/resources/mapper/SimulationNodeMapper.xml index ca0a5f15..7eaee8be 100644 --- a/project/src/main/resources/mapper/SimulationNodeMapper.xml +++ b/project/src/main/resources/mapper/SimulationNodeMapper.xml @@ -366,31 +366,31 @@ and task.tag1 = #{req.tag1} - + and task.tag2 = #{req.tag2} - + and task.tag3 = #{req.tag3} - + and task.tag4 = #{req.tag4} - + and task.tag5 = #{req.tag5} - + and task.tag6 = #{req.tag6} - + and task.tag7 = #{req.tag7} - + and task.tag8 = #{req.tag8} - + and task.tag9 = #{req.tag9} - + and task.tag10 = #{req.tag10} @@ -419,31 +419,31 @@ and task.tag1 = #{req.tag1} - + and task.tag2 = #{req.tag2} - + and task.tag3 = #{req.tag3} - + and task.tag4 = #{req.tag4} - + and task.tag5 = #{req.tag5} - + and task.tag6 = #{req.tag6} - + and task.tag7 = #{req.tag7} - + and task.tag8 = #{req.tag8} - + and task.tag9 = #{req.tag9} - + and task.tag10 = #{req.tag10} @@ -463,31 +463,31 @@ and task.tag1 = #{req.tag1} - + and task.tag2 = #{req.tag2} - + and task.tag3 = #{req.tag3} - + and task.tag4 = #{req.tag4} - + and task.tag5 = #{req.tag5} - + and task.tag6 = #{req.tag6} - + and task.tag7 = #{req.tag7} - + and task.tag8 = #{req.tag8} - + and task.tag9 = #{req.tag9} - + and task.tag10 = #{req.tag10} @@ -509,31 +509,31 @@ and task.tag1 = #{req.tag1} - + and task.tag2 = #{req.tag2} - + and task.tag3 = #{req.tag3} - + and task.tag4 = #{req.tag4} - + and task.tag5 = #{req.tag5} - + and task.tag6 = #{req.tag6} - + and task.tag7 = #{req.tag7} - + and task.tag8 = #{req.tag8} - + and task.tag9 = #{req.tag9} - + and task.tag10 = #{req.tag10}