Merge remote-tracking branch 'origin/main'

data/src/main/java/com/sdm/data/controller/DataStorageAnalysisController.java

@@ -93,6 +93,7 @@ public class DataStorageAnalysisController {
         return dataStorageAnalysis.addUserQuota(addUserQuota);
     }
     // 查询用户配额
+    @SysLog("查询用户配额")
     @PostMapping("/listUserQuota")
     @Operation(summary = "查询用户配额")
     public SdmResponse listUserQuota(@RequestBody ListUserQuotaReq listUserQuotaReq){

data/src/main/java/com/sdm/data/controller/ModelTraningController.java

@@ -46,6 +46,7 @@ public class ModelTraningController {
     /**
      * 获取模型列表
      */
+    @SysLog("获取模型列表")
     @PostMapping("/getModelList")
     @Operation(summary = "获取模型列表", description = "获取模型列表")
     public SdmResponse getModelList(@RequestBody QueryModelReq baseReq) {
@@ -55,6 +56,7 @@ public class ModelTraningController {
     /**
      * 获取模型详情
      */
+    @SysLog("获取模型详情")
     @GetMapping("/getModelDetail")
     @Operation(summary = "获取模型详情", description = "获取模型详情")
     public SdmResponse getModelDetail(@RequestParam Long modelId) {
@@ -102,6 +104,7 @@ public class ModelTraningController {
     /**
      * 获取训练数据输入输出特征设置详情
      */
+    @SysLog("获取训练数据输入输出特征设置详情")
     @GetMapping("/getTrainingDataInPutOutPutColumn")
     @Operation(summary = "获取训练数据输入输出特征设置详情", description = "获取训练数据输入输出特征设置详情")
     public SdmResponse getTrainingDataInPutOutPutColumn(@RequestParam Long modelId) {
@@ -121,6 +124,7 @@ public class ModelTraningController {
     /**
      * 获取算法参数设置详情
      */
+    @SysLog("获取算法参数设置详情")
     @GetMapping("/getAlgorithmParam")
     @Operation(summary = "获取算法参数设置详情", description = "获取算法参数设置详情")
     public SdmResponse getAlgorithmParam(@RequestParam Long modelId) {
@@ -142,6 +146,7 @@ public class ModelTraningController {
      *
      * @param modelId
      */
+    @SysLog("获取训练曲线和训练日志")
     @GetMapping("/getTrainingResult")
     @Operation(summary = "获取训练曲线和训练日志", description = "获取训练曲线和训练日志")
     public SdmResponse getTrainingResult(@RequestParam Long modelId) {
@@ -161,6 +166,7 @@ public class ModelTraningController {
     /**
      * 进入模型预测页面，获取历史模型预测结果
      */
+    @SysLog("获取历史模型预测结果")
     @GetMapping("/getModelPredictResult")
     @Operation(summary = "进入模型预测页面，获取历史模型预测结果", description = "进入模型预测页面，获取历史模型预测结果")
     public SdmResponse getModelPredictResult(@RequestParam Long modelId) {

data/src/main/java/com/sdm/data/controller/SimulationParameterLibraryController.java

@@ -67,6 +67,7 @@ public class SimulationParameterLibraryController {
     /**
      * 获取仿真参数展示树
      */
+    @SysLog("获取仿真参数展示树")
     @GetMapping("/getSimulationParameterTree")
     @Operation(summary = "获取仿真参数展示树", description = "获取仿真参数展示树")
     public SdmResponse getSimulationParameterTree(@Parameter(description = "1：模型库/2：模型库分类/3：参数对象") @RequestParam(value = "type", required = false) Integer type, @Parameter(description = "传对应模型库id/模型库分类id/参数对象id，不传查所有的模型库") @RequestParam(value = "id", required = false) Long id) {
@@ -100,6 +101,7 @@ public class SimulationParameterLibraryController {
     /**
      * 获取仿真参数库分类参数对象 和JSON数据
      */
+    @SysLog("获取仿真参数库分类参数对象")
     @GetMapping("/getSimulationParameterLibraryCategoryObject")
     @Operation(summary = "获取仿真参数库分类参数对象和JSON数据", description = "获取仿真参数库分类参数对象")
     public SdmResponse getSimulationParameterLibraryCategoryObject(@Parameter(description = "参数对象id") @RequestParam(value = "ObjectId") Long ObjectId) {

data/src/main/java/com/sdm/data/service/impl/FileSimulationMappingServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -85,12 +86,17 @@ public class FileSimulationMappingServiceImpl extends ServiceImpl<FileSimulation
         List<FileSimulationMapping> list = this.lambdaQuery().eq(FileSimulationMapping::getSimulationPoolId, getFileSimulationMappingReq.getSimulationPoolId())
                 .eq(FileSimulationMapping::getSimulationPoolVersion, getFileSimulationMappingReq.getSimulationPoolVersion())
                 .list();
+        Map<String, List<FileMetadataInfoResp>>  map = new HashMap<>();
         if (list.isEmpty()) {
-            return SdmResponse.success();
+            SdmResponse response = SdmResponse.success();
+            response.setData(map);
+            return response;
         }
         List<FileMetadataInfo> fileMetadataInfos = fileMetadataInfoService.lambdaQuery().in(FileMetadataInfo::getId, list.stream().map(FileSimulationMapping::getFileId).toList()).list();
         if (fileMetadataInfos.isEmpty()) {
-            return SdmResponse.success();
+            SdmResponse response = SdmResponse.success();
+            response.setData(map);
+            return response;
         }
         List<FileMetadataInfoResp> fileMetadataInfoResps = new ArrayList<>();
         fileMetadataInfos.forEach(fileMetadataInfo -> {