toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
lidongyang
2025-12-31 16:46:19 +08:00
parent d179a1c170 dd9574598c
commit a846b42c9b
5 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java
View File

@@ -92,9 +92,9 @@ public class SimuluationTaskPoolController implements ISimuluationTaskPoolFeignC
@GetMapping(value = "/getAllTaskPool")
@ResponseBody
SdmResponse getSimulationAllTaskPool()
SdmResponse getSimulationAllTaskPool(@RequestParam boolean bCurrent)
{
return service.getAllTaskPool();
return service.getAllTaskPool(bCurrent);
}
@PostMapping(value = "/importTaskPool")

3
task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java
View File

@@ -35,6 +35,9 @@ public interface SimulationPoolMapper {
@Select("SELECT poolVersion,poolName FROM simulation_pool_versions WHERE poolName=#{poolName} ORDER BY createTime DESC")
List<TaskPoolVersion> queryTaskPoolAllVersion(@Param("poolName")String poolName);
@Select("SELECT poolName,poolVersion,poolId FROM simulation_pool_versions GROUP BY poolName,poolVersion,poolId")
List<TaskPoolVersion> queryAllTaskPoolVersion();
@Select("SELECT * FROM simulation_pool")
List<TaskPoolBrief> queryAllTaskPool();

5
task/src/main/java/com/sdm/task/model/entity/TaskPoolBrief.java
View File

@@ -2,6 +2,9 @@ package com.sdm.task.model.entity;
import com.sdm.common.entity.bo.BaseBean;
import java.util.ArrayList;
import java.util.List;
public class TaskPoolBrief extends BaseBean
{
public TaskPoolBrief()
@@ -16,4 +19,6 @@ public class TaskPoolBrief extends BaseBean
public long tenantId;
public long creator;
public String createTime;
//附加属性
public List<String> versions = new ArrayList<>();
}

2
task/src/main/java/com/sdm/task/service/ISimulationTaskPoolService.java
View File

@@ -46,7 +46,7 @@ public interface ISimulationTaskPoolService {
SdmResponse cleanTaskPool(String poolName);
SdmResponse getAllTaskPool();
SdmResponse getAllTaskPool(boolean bCurrent);
SdmResponse importTaskPool(MultipartFile multipartFile,String dicts,String poolName,String columns);

33
task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java
View File

@@ -1483,10 +1483,37 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
* 获取系统内所有的分析项库
* @return
*/
public SdmResponse getAllTaskPool()
public SdmResponse getAllTaskPool(boolean bCurrent)
{
SdmResponse response = SdmResponse.success();
List<TaskPoolBrief> poolBriefs = mapper.queryAllTaskPool();
if(!bCurrent)
{
List<TaskPoolVersion> allPoolVersions = mapper.queryAllTaskPoolVersion();
Map<String,List<TaskPoolVersion>> taskPoolMap = new HashMap<>();
for(TaskPoolVersion taskPoolVersion : allPoolVersions)
{
List<TaskPoolVersion> poolVersions = taskPoolMap.get(taskPoolVersion.poolName);
if(poolVersions == null)
{
poolVersions = new ArrayList<>();
taskPoolMap.put(taskPoolVersion.poolName, poolVersions);
}
poolVersions.add(taskPoolVersion);
}
for(TaskPoolBrief poolBrief : poolBriefs)
{
List<TaskPoolVersion> versions = taskPoolMap.get(poolBrief.poolName);
if(versions != null)
{
for(TaskPoolVersion version : versions)
{
poolBrief.versions.add(version.poolVersion);
}
}
}
}
response.setData(poolBriefs);
return response;
}
@@ -2482,10 +2509,6 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
return response;
}
}