Merge remote-tracking branch 'origin/main'

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

@@ -8,6 +8,7 @@ import com.sdm.common.entity.resp.data.BatchAddFileInfoResp;
 import com.sdm.common.entity.resp.data.ChunkUploadMinioFileResp;
 import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
 import com.sdm.common.feign.inter.data.IDataFeignClient;
+import com.sdm.common.log.annotation.SysLog;
 import com.sdm.data.model.entity.FileMetadataInfo;
 import com.sdm.data.model.req.*;
 import com.sdm.data.model.resp.KKFileViewURLFromMinioResp;
@@ -162,6 +163,7 @@ public class DataFileController implements IDataFeignClient {
      * @param req
      * @return
      */
+    @SysLog("更新用户权限")
     @PostMapping("/updatePermission")
     @Operation(summary = "更新用户权限", description = "更新用户对指定文件或文件夹的权限")
     public SdmResponse updatePermission(@RequestBody @Validated UpdatePermissionReq req) {

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

@@ -3,6 +3,7 @@ package com.sdm.data.controller;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.sdm.common.common.SdmResponse;
 import com.sdm.common.entity.resp.PageDataResp;
+import com.sdm.common.log.annotation.SysLog;
 import com.sdm.data.model.entity.FileStorage;
 import com.sdm.data.model.req.AddUserQuotaEntity;
 import com.sdm.data.model.req.ListUserQuotaReq;
@@ -85,6 +86,7 @@ public class DataStorageAnalysisController {
     }
 
     //新增用户配额
+    @SysLog("新增用户配额")
     @PostMapping("/addUserQuota")
     @Operation(summary = "新增用户配额")
     public SdmResponse addUserQuota(@RequestBody AddUserQuotaEntity addUserQuota){
@@ -96,7 +98,9 @@ public class DataStorageAnalysisController {
     public SdmResponse listUserQuota(@RequestBody ListUserQuotaReq listUserQuotaReq){
         return dataStorageAnalysis.listUserQuota(listUserQuotaReq);
     }
+
     //批量修改用户配额
+    @SysLog("批量修改用户配额")
     @PostMapping("/batchUpdateUserQuota")
     @Operation(summary = "批量修改用户配额")
     public SdmResponse batchUpdateUserQuota(@RequestBody List<AddUserQuotaEntity> addUserQuota){

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

@@ -3,6 +3,7 @@ package com.sdm.data.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.log.annotation.SysLog;
 import com.sdm.data.model.req.dimensionTemplate.TemplateCreationRequest;
 import com.sdm.data.service.IDimensionTemplateService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -35,6 +36,7 @@ public class DimensionTemplateController {
      * @param request 包含模板信息和层级列表的请求参数
      * @return 是否创建成功
      */
+    @SysLog("创建或更新模板及层级信息")
     @PostMapping("/saveTemplateWithHierarchies")
     @Operation(summary = "创建或更新模板及层级信息", description = "根据请求参数中的ID判断是创建还是更新维度模板及层级信息")
     public SdmResponse saveTemplateWithHierarchies(@Valid @RequestBody @Parameter(description = "包含模板信息和层级列表的请求参数") TemplateCreationRequest request) {
@@ -87,6 +89,7 @@ public class DimensionTemplateController {
      * @return 返回操作结果的SdmResponse对象
      * @throws RuntimeException 如果删除过程中发生异常，则抛出RuntimeException异常
      */
+    @SysLog("删除模板及层级信息")
     @GetMapping("/deleteTemplateWithHierarchies")
     @Operation(summary = "删除模板及层级信息", description = "根据给定的模板ID，删除该模板及其相关的层级关系数据")
     public SdmResponse deleteTemplateWithHierarchies(@RequestParam("id") @Parameter(description = "维度模板ID") Long id) {

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

@@ -6,6 +6,7 @@ import com.sdm.common.entity.req.data.GetFileSimulationMappingReq;
 import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
 import com.sdm.common.feign.inter.data.IFileSimulationMappingFeignClient;
 import com.sdm.common.entity.req.data.SaveFileSimulationMappingReq;
+import com.sdm.common.log.annotation.SysLog;
 import com.sdm.data.service.IFileSimulationMappingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +34,7 @@ public class FileSimulationMappingController implements IFileSimulationMappingFe
     /**
      * 保存工况任务与文件绑定关系
      */
+    @SysLog("保存工况任务与文件绑定关系")
     @PostMapping("/saveFileSimulationMapping")
     public SdmResponse batchSaveFileSimulationMapping(@RequestBody List<SaveFileSimulationMappingReq> saveFileSimulationMappingReq) {
         return fileSimulationMappingService.batchSaveFileSimulationMapping(saveFileSimulationMappingReq);

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

@@ -3,6 +3,7 @@ package com.sdm.data.controller;
 import com.sdm.common.common.SdmResponse;
 import com.sdm.common.entity.req.data.BaseReq;
 import com.sdm.common.entity.req.data.ModelExportExcelFormat;
+import com.sdm.common.log.annotation.SysLog;
 import com.sdm.data.model.req.*;
 import com.sdm.data.service.IModelService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -25,6 +26,7 @@ public class ModelTraningController {
     /**
      * 新增训练模型
      */
+    @SysLog("新增训练模型")
     @PostMapping("/addModel")
     @Operation(summary = "新增训练模型", description = "新增训练模型")
     public SdmResponse addModel(@RequestBody AddModelReq addModelReq) {
@@ -34,6 +36,7 @@ public class ModelTraningController {
     /**
      * 删除模型
      */
+    @SysLog("删除模型")
     @GetMapping("/deleteModel")
     @Operation(summary = "删除模型", description = "删除模型")
     public SdmResponse deleteModel(@RequestParam Long modelId) {
@@ -61,6 +64,7 @@ public class ModelTraningController {
     /**
      * 修改模型
      */
+    @SysLog("修改模型")
     @PostMapping("/updateModel")
     @Operation(summary = "修改模型", description = "修改模型")
     public SdmResponse updateModel(@RequestBody AddModelReq addModelReq) {
@@ -88,6 +92,7 @@ public class ModelTraningController {
     /**
      * 设置训练数据输入输出特征列
      */
+    @SysLog("设置训练数据输入输出特征列")
     @PostMapping("/setTrainingDataInPutOutPutColumn")
     @Operation(summary = "设置训练数据输入输出特征列", description = "设置训练数据输入输出特征列")
     public SdmResponse setTrainingDataInPutOutPutColumn(@RequestBody SetTrainingDataInPutOutPutColumnReq req) {
@@ -106,6 +111,7 @@ public class ModelTraningController {
     /**
      * 算法参数设置并提交训练
      */
+    @SysLog("算法参数设置并提交训练")
     @PostMapping("/submitTraining")
     @Operation(summary = "算法参数设置并提交训练", description = "算法参数设置并提交训练")
     public SdmResponse submitTraining(@RequestBody AlgorithmParamReq algorithmParamReq) {
@@ -124,6 +130,7 @@ public class ModelTraningController {
     /**
      * 停止模型训练
      */
+    @SysLog("停止模型训练")
     @GetMapping("/stopTraining")
     @Operation(summary = "停止模型训练", description = "停止模型训练")
     public SdmResponse stopTraining(@RequestParam Long modelId) {
@@ -144,6 +151,7 @@ public class ModelTraningController {
     /**
      * 开始数据预测
      */
+    @SysLog("数据预测")
     @PostMapping("/startPredict")
     @Operation(summary = "数据预测", description = "数据预测")
     public SdmResponse startPredict(@Parameter(description = "数据预测请求对象") @RequestBody ModelPredictReq modelPredictReq) {

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

@@ -2,6 +2,7 @@ package com.sdm.data.controller;
 
 
 import com.sdm.common.common.SdmResponse;
+import com.sdm.common.log.annotation.SysLog;
 import com.sdm.data.model.req.SimulationParamLibraryReq;
 import com.sdm.data.model.req.SimulationParameterLibraryCategoryObjectReq;
 import com.sdm.data.model.resp.SimulationParameterLibraryCategoryObjectResp;
@@ -35,6 +36,7 @@ public class SimulationParameterLibraryController {
      * @param parameterLibraryName 仿真参数库名
      * @return 添加结果
      */
+    @SysLog("添加仿真参数库")
     @GetMapping("/addLibrary")
     @Operation(summary = "添加仿真参数库", description = "添加新的仿真参数库")
     public SdmResponse addLibrary(@Parameter(description = "仿真参数库名") @RequestParam(value = "parameterLibraryName") String parameterLibraryName) {
@@ -44,6 +46,7 @@ public class SimulationParameterLibraryController {
     /**
      * 添加仿真参数库分类
      */
+    @SysLog("添加仿真参数库分类")
     @GetMapping("/addLibraryCategory")
     @Operation(summary = "添加仿真参数库分类", description = "添加新的仿真参数库分类")
     public SdmResponse addLibraryCategory(@Parameter(description = "仿真参数库ID") @RequestParam(value = "parameterLibraryId") Long parameterLibraryId, @Parameter(description = "仿真参数库分类名") @RequestParam(value = "parameterLibraryCategoryName") String parameterLibraryCategoryName) {
@@ -53,6 +56,7 @@ public class SimulationParameterLibraryController {
     /**
      * 添加仿真参数库分类的参数对象
      */
+    @SysLog("添加仿真参数库分类的参数对象")
     @PostMapping(value = "/addLibraryCategoryObject", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @Operation(summary = "添加仿真参数库分类的参数对象", description = "添加新的仿真参数库分类的参数对象")
     public SdmResponse addLibraryCategoryObject(SimulationParameterLibraryCategoryObjectReq simulationParameterLibraryCategoryObjectReq) {
@@ -72,6 +76,7 @@ public class SimulationParameterLibraryController {
      * 编辑仿真参数库、仿真参数库分类、真参数库分类的参数对象的名称
      * @return
      */
+    @SysLog("编辑仿真参数库、仿真参数库分类、真参数库分类的参数对象的名称")
     @PostMapping("/editSimulationParameter")
     @Operation(summary = "编辑仿真参数库、仿真参数库分类、真参数库分类的参数对象的名称", description = "编辑仿真参数库、仿真参数库分类、真参数库分类的参数对象的名称")
     SdmResponse editSimulationParameter(@RequestBody SimulationParamLibraryReq req) {
@@ -83,6 +88,7 @@ public class SimulationParameterLibraryController {
      *
      * @return
      */
+    @SysLog("删除仿真参数库数据")
     @PostMapping("/deleteSimulationParameter")
     @Operation(summary = "删除仿真参数库数据", description = "删除仿真参数库数据")
     SdmResponse deleteSimulationParameter(@RequestBody SimulationParamLibraryReq req) {