Merge branch 'main' of http://192.168.65.198:3000/toolchaintechnologycenter/spdm-backend

1-sql/2026-04-01/simulation_pool.sql

@@ -0,0 +1 @@
+ALTER TABLE `simulation_pool` ADD COLUMN `iconFile` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci NULL DEFAULT '' COMMENT '分析项库图标文件Id' AFTER `parentVersion`;

task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java

@@ -7,6 +7,7 @@ import com.sdm.common.entity.pojo.task.TaskBaseInfo;
 import com.sdm.common.entity.req.system.LaunchApproveReq;
 import com.sdm.common.entity.req.task.BindTaskAndFlowTemplateReq;
 import com.sdm.common.feign.inter.task.ISimuluationTaskPoolFeignClient;
+import com.sdm.task.model.entity.TaskPoolBrief;
 import com.sdm.task.model.entity.TaskPoolPerformance;
 import com.sdm.task.model.entity.TaskPoolUpdateBean;
 import com.sdm.task.model.req.ExportTaskPoolReq;
@@ -92,6 +93,13 @@ public class SimuluationTaskPoolController implements ISimuluationTaskPoolFeignC
         return service.cleanTaskPool(poolName,version);
     }
 
+    @PostMapping(value = "/updateTaskPoolBrief")
+    @ResponseBody
+    SdmResponse updateSimulationTaskPool(@RequestBody TaskPoolBrief poolBrief)
+    {
+        return service.updateTaskPoolBrief(poolBrief);
+    }
+
     @GetMapping(value = "/getAllTaskPool")
     @ResponseBody
     SdmResponse  getSimulationAllTaskPool(@RequestParam boolean bCurrent)

task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java

@@ -13,7 +13,7 @@ public interface SimulationPoolMapper {
     int addNewNamespace(@Param("entity") Namespace entity);*/
 
 
-    @Insert("INSERT INTO simulation_pool(poolName,comment,currentVersion,parentVersion,creator,tenantId) VALUES(#{brief.poolName},#{brief.comment},#{brief.currentVersion},#{brief.parentVersion},#{brief.creator},#{brief.tenantId})")
+    @Insert("INSERT INTO simulation_pool(poolName,comment,currentVersion,parentVersion,iconFile,creator,tenantId) VALUES(#{brief.poolName},#{brief.comment},#{brief.currentVersion},#{brief.parentVersion},#{brief.iconFile},#{brief.creator},#{brief.tenantId})")
     @Options(useGeneratedKeys=true,keyProperty="id")
     int addTaskPoolBreif(@Param("brief") TaskPoolBrief brief);
 
@@ -115,7 +115,8 @@ public interface SimulationPoolMapper {
     })
     int batchAddSimulationPoolPerformanceExtra(@Param("list")List<TaskPoolPerformanceExtra> list);
 
-    @Update("UPDATE simulation_pool SET currentVersion=#{brief.currentVersion},parentVersion=#{brief.parentVersion},comment=#{brief.comment} WHERE poolName=#{brief.poolName}")
+    //@Update("UPDATE simulation_pool SET currentVersion=#{brief.currentVersion},parentVersion=#{brief.parentVersion},comment=#{brief.comment},iconFile=#{brief.iconFile} WHERE poolName=#{brief.poolName}")
+    @Update("UPDATE simulation_pool SET comment=#{brief.comment},iconFile=#{brief.iconFile} WHERE poolName=#{brief.poolName}")
     int updateTaskPoolBrief(@Param("brief")TaskPoolBrief brief);
 
     @Update("UPDATE simulation_pool_node SET nodeName=#{node.nodeName},nodeCode=#{node.nodeCode},englishName=#{node.englishName},nodeType=#{node.nodeType},nodeSubType=#{node.nodeSubType},nodeOrder=#{node.nodeOrder},description=#{node.description} WHERE uuid=#{node.uuid}")

task/src/main/java/com/sdm/task/model/entity/TaskPoolBrief.java

@@ -16,8 +16,10 @@ public class TaskPoolBrief extends BaseBean
     public String comment;
     public String parentVersion;
     public String currentVersion;
+    public String iconFile;
     public long tenantId;
     public long creator;
+    public String creatorName;
     public String createTime;
     //附加属性
     public List<String> versions = new ArrayList<>();

task/src/main/java/com/sdm/task/service/ISimulationTaskPoolService.java

@@ -9,6 +9,7 @@ import com.sdm.common.entity.pojo.task.TaskBaseInfo;
 import com.sdm.common.entity.req.system.LaunchApproveReq;
 import com.sdm.common.entity.req.task.BindTaskAndFlowTemplateReq;
 import com.sdm.task.model.entity.SimulatePoolTaskFlowTemplateRelate;
+import com.sdm.task.model.entity.TaskPoolBrief;
 import com.sdm.task.model.entity.TaskPoolPerformance;
 import com.sdm.task.model.entity.TaskPoolUpdateBean;
 import com.sdm.task.model.req.ExportTaskPoolReq;
@@ -24,6 +25,8 @@ public interface ISimulationTaskPoolService {
 
     SdmResponse createTaskPool(JSONObject jsonObject);
 
+    SdmResponse updateTaskPoolBrief(TaskPoolBrief poolBrief);
+
     SdmResponse getPoolTreeByVersion(String poolName,String version);
 
     SdmResponse getAllTaslPoolCurrentVersion();

task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java

@@ -21,6 +21,7 @@ import com.sdm.common.entity.req.task.BindTaskAndFlowTemplateReq;
 import com.sdm.common.entity.resp.capability.FlowTemplateResp;
 import com.sdm.common.entity.resp.capability.ReportTemplateResp;
 import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
+import com.sdm.common.entity.resp.system.CIDUserResp;
 import com.sdm.common.feign.impl.project.SimulationTaskFeignClientImpl;
 import com.sdm.common.feign.impl.system.ApproveFeignClientImpl;
 import com.sdm.common.feign.inter.capability.ISimulationFlowFeignClient;
@@ -28,6 +29,7 @@ import com.sdm.common.feign.inter.capability.ISimulationReportFeignClient;
 import com.sdm.common.feign.inter.data.IFileSimulationMappingFeignClient;
 import com.sdm.common.feign.inter.project.ISimulationTaskFeignClient;
 import com.sdm.common.service.BaseService;
+import com.sdm.common.service.UserNameCacheService;
 import com.sdm.common.utils.SystemOperate;
 import com.sdm.common.utils.excel.ExcelUtil;
 import com.sdm.task.dao.SimulationPoolMapper;
@@ -76,6 +78,9 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
     @Autowired
     private ISimulationReportFeignClient simulationReportFeignClient;
 
+    @Autowired
+    private UserNameCacheService userNameCacheService;
+
     @Value("${approve.replyUrl}")
     private String approveReplyUrl;
 
@@ -1354,6 +1359,21 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
         return response;
     }
 
+    /**
+     * 更新工况库基本信息
+     * @param poolBrief
+     * @return
+     */
+    public SdmResponse updateTaskPoolBrief(TaskPoolBrief poolBrief)
+    {
+        SdmResponse response = SdmResponse.success();
+        if(mapper.updateTaskPoolBrief(poolBrief) <= 0)
+        {
+            response = SdmResponse.failed("更新失败");
+        }
+        return response;
+    }
+
     /**
      * 根据版本删除分析项库
      * @param poolName