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 
# Conflicts:
#	.idea/jarRepositories.xml
This commit is contained in:
lidongyang
2025-10-16 15:53:31 +08:00
parent ca79ba2486 70717a94a9
commit 04724f7c3b
24 changed files with 379 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/sdm/common/service/BaseService.java
View File

@@ -4,7 +4,7 @@ import java.util.UUID;
public class BaseService {
private String generateUuid(String prefix)
private static String generateUuid(String prefix)
{
String millis = String.valueOf(System.currentTimeMillis());
return prefix+UUID.randomUUID()+millis.substring(8);
@@ -104,7 +104,7 @@ public class BaseService {
protected String generateUuid() {
public static String generateUuid() {
return generateUuid("simu_");
}

17
gateway2/src/main/resources/bin/stop.bat
View File

@@ -1,8 +1,17 @@
@echo off
echo Stopping gateway2 service...
REM 强制终止匹配的Java进程
taskkill /f /im java.exe /fi "WINDOWTITLE eq *gateway2-0.0.1-SNAPSHOT.jar*" >nul 2>&1
taskkill /f /im javaw.exe /fi "WINDOWTITLE eq *gateway2-0.0.1-SNAPSHOT.jar*" >nul 2>&1
REM 第一步：找到 gateway2-0.0.1-SNAPSHOT.jar 对应的进程 ID（PID）
for /f "tokens=1" %%p in ('jps -l ^| findstr "gateway2-0.0.1-SNAPSHOT.jar"') do (
set PID=%%p
)
echo gateway2 service stopped.
REM 第二步：如果找到 PID，就终止进程
if defined PID (
taskkill /f /pid %PID% >nul 2>&1
echo Killed process with PID: %PID%
) else (
echo gateway2 service is not running.
)
echo gateway2 service stopped.

37
task/src/main/java/com/sdm/task/controller/SimulationPerformanceController.java
View File

@@ -2,21 +2,21 @@ package com.sdm.task.controller;
import com.sdm.common.common.SdmResponse;
import com.sdm.task.model.entity.SimulationPerformance;
import com.sdm.task.model.req.BatchAddTaskPerformanceReq;
import com.sdm.task.service.ISimulationPerformanceService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
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.*;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* 任务的指标
* 任务的指标
* </p>
*
* @author author
@@ -31,6 +31,7 @@ public class SimulationPerformanceController {
/**
* 获取指定任务的性能指标
*
* @param taskId 任务id
* @return
*/
@@ -40,4 +41,30 @@ public class SimulationPerformanceController {
return simulationPerformanceService.getTaskPerformance(taskId);
}
/**
* 批量新增任务性能指标
*
* @param batchAddTaskPerformanceReq 批量新增任务性能指标请求
* @return 操作结果
*/
@PostMapping("/batchAddTaskPerformance")
@Operation(summary = "批量新增任务性能指标")
public SdmResponse batchAddTaskPerformance(
@RequestBody BatchAddTaskPerformanceReq batchAddTaskPerformanceReq) {
return simulationPerformanceService.batchAddTaskPerformance(batchAddTaskPerformanceReq);
}
/**
* 批量删除任务性能指标
*
* @param performanceIds 指标ID
* @return 操作结果
*/
@PostMapping("/batchDeleteTaskPerformance")
@Operation(summary = "批量删除任务性能指标")
public SdmResponse batchDeleteTaskPerformance(@RequestBody List<Integer> performanceIds) {
return simulationPerformanceService.batchDeleteTaskPerformance(performanceIds);
}
}

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

@@ -79,5 +79,12 @@ public class SimuluationTaskPoolController {
{
return service.exportTaskPool(response,jsonObject);
}
@GetMapping(value = "/getTaskPoolLoadcases")
@ResponseBody
SdmResponse getTaskPoolLoadcases(@RequestParam("poolName") String poolName,@RequestParam("version")String version)
{
return service.getSimulationPoolTasks(poolName,version);
}
}

44
task/src/main/java/com/sdm/task/model/bo/BaseBean.java
View File

@@ -1,44 +0,0 @@
package com.sdm.task.model.bo;
import java.lang.reflect.Field;
public class BaseBean {
protected void init()
{
Class cls = this.getClass();
Field[] fields = cls.getDeclaredFields();
try {
for (Field field : fields) {
Class typeClass = field.getType();
if (typeClass == String.class) {
String empty = "";
field.set(this, empty);
}
else if(typeClass == Byte.class)
{
field.setByte(this,(byte)0);
}
else if(typeClass == Integer.class)
{
field.setInt(this,0);
}
else if(typeClass == Long.class)
{
field.setLong(this,0);
}
else if(typeClass == Float.class)
{
field.setFloat(this,0);
}
else if(typeClass == Double.class)
{
field.setDouble(this,0);
}
}
}
catch (Exception exception)
{
exception.printStackTrace();
}
}
}

25
task/src/main/java/com/sdm/task/model/bo/NodeBase.java
View File

@@ -1,25 +0,0 @@
package com.sdm.task.model.bo;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import java.util.ArrayList;
import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true)
public class NodeBase extends BaseBean{
public int id;
public String uuid;
public String nodeName;
public String englishName;
public String nodeCode;
public String nodeType;
public String poolName;
public String poolVersion;
public String levelType;
public int pId;
public String pUuid;
public String tenantId;
public String description;
public String createTime;
public String creator;
public List<NodeBase> children = new ArrayList<>(); //适配前端组件
}

16
task/src/main/java/com/sdm/task/model/bo/PropertyExtra.java
View File

@@ -1,16 +0,0 @@
package com.sdm.task.model.bo;
public class PropertyExtra extends BaseBean{
public int id;
public String uuid = "";
public String propertyName = "";
public String propertyValue = "";
public String valueType = "";
public String propertyClass = "";
}

17
task/src/main/java/com/sdm/task/model/bo/TaskPoolBrief.java
View File

@@ -1,17 +0,0 @@
package com.sdm.task.model.bo;
public class TaskPoolBrief extends BaseBean
{
public TaskPoolBrief()
{
init();
}
public int id;
public String poolName;
public String comment;
public String parentVersion;
public String currentVersion;
public String tenantId;
public String creator;
public String createTime;
}

42
task/src/main/java/com/sdm/task/model/bo/TaskPoolItem.java
View File

@@ -1,42 +0,0 @@
package com.sdm.task.model.bo;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import java.util.ArrayList;
import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true)
public class TaskPoolItem extends NodeBase{
public TaskPoolItem()
{
init();
levelType = "task";
nodeType = "task";
}
public String nodeId;
public int days;
public String standard;
public String analyseTarget;
public float confidence;
public String analyseSoftware;
public String imageFileId;
public String bCapacity;
public String department;
public String discipline;
public String group;
public float difficult;
public List<TaskPoolItemExtra> extras = new ArrayList<>();
public List<TaskPoolPerformance> performances = new ArrayList<>();
public void addTaskExtra(TaskPoolItemExtra extra)
{
extras.add(extra);
}
public void addTaskPerformance(TaskPoolPerformance performance)
{
performances.add(performance);
}
}

12
task/src/main/java/com/sdm/task/model/bo/TaskPoolItemExtra.java
View File

@@ -1,12 +0,0 @@
package com.sdm.task.model.bo;
public class TaskPoolItemExtra extends PropertyExtra{
public TaskPoolItemExtra()
{
init();
}
public String taskId;
public String nodeId;
public String poolName;
}

61
task/src/main/java/com/sdm/task/model/bo/TaskPoolNode.java
View File

@@ -1,61 +0,0 @@
package com.sdm.task.model.bo;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import java.util.ArrayList;
import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true)
public class TaskPoolNode extends NodeBase {
public TaskPoolNode()
{
init();
levelType = "node";
}
public String nodeType;
public String nodeSubType;
public String parentId;
public int nodeLevel;
public int nodeOrder;
public List<TaskPoolNodeExtra> extras = new ArrayList<>();
public List<TaskPoolNode> subNodes = new ArrayList<>();
public List<TaskPoolItem> tasks = new ArrayList<>();
public void addNodeExtra(TaskPoolNodeExtra nodeExtra)
{
extras.add(nodeExtra);
}
public void addNodeTask(TaskPoolItem task)
{
tasks.add(task);
}
public void addSubNodeOrder(TaskPoolNode subNode)
{
if(subNode.nodeOrder == 0)
{
subNodes.add(subNode);
}
else
{
boolean bInsert = false;
for (int index = 0; index < subNodes.size(); index++)
{
TaskPoolNode poolNode = subNodes.get(index);
if(subNode.nodeOrder < poolNode.nodeOrder)
{
subNodes.add(index,subNode);
bInsert = true;
break;
}
}
if(!bInsert) {
subNodes.add(subNode);
}
}
}
}

12
task/src/main/java/com/sdm/task/model/bo/TaskPoolNodeExtra.java
View File

@@ -1,12 +0,0 @@
package com.sdm.task.model.bo;
public class TaskPoolNodeExtra extends PropertyExtra{
public TaskPoolNodeExtra()
{
init();
}
public String nodeId;
public String poolName;
}

33
task/src/main/java/com/sdm/task/model/bo/TaskPoolPerformance.java
View File

@@ -1,33 +0,0 @@
package com.sdm.task.model.bo;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import java.util.ArrayList;
import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true)
public class TaskPoolPerformance extends NodeBase{
public TaskPoolPerformance()
{
init();
levelType = "performance";
nodeType = "performance";
}
public String taskId;
public String nodeId;
public String poolName;
public String taskName;
public String standard;
public String performanceType;
public String unit;
public String lowValue;
public String highValue;
public String method;
public List<TaskPoolPerformanceExtra> extras = new ArrayList<>();
public void addPerformanceExtra(TaskPoolPerformanceExtra extra)
{
extras.add(extra);
}
}

13
task/src/main/java/com/sdm/task/model/bo/TaskPoolPerformanceExtra.java
View File

@@ -1,13 +0,0 @@
package com.sdm.task.model.bo;
public class TaskPoolPerformanceExtra extends PropertyExtra{
public TaskPoolPerformanceExtra()
{
init();
}
public String taskId;
public String nodeId;
public String performanceId;
public String poolName;
}

34
task/src/main/java/com/sdm/task/model/bo/TaskPoolTree.java
View File

@@ -1,34 +0,0 @@
package com.sdm.task.model.bo;
import java.util.ArrayList;
import java.util.List;
public class TaskPoolTree extends BaseBean{
public TaskPoolBrief poolBrief;
public List<TaskPoolNode> nodes = new ArrayList<>();
public void addTopNodeOrder(TaskPoolNode node)
{
if(node.nodeOrder == 0)
{
nodes.add(node);
}
else
{
boolean bInsert = false;
for(int index=0; index<nodes.size(); index++)
{
if(node.nodeOrder < nodes.get(index).nodeOrder)
{
nodes.add(index,node);
bInsert = true;
break;
}
}
if(!bInsert)
{
nodes.add(node);
}
}
}
}

97
task/src/main/java/com/sdm/task/model/bo/TaskPoolUpdateBean.java
View File

@@ -1,97 +0,0 @@
package com.sdm.task.model.bo;
import com.alibaba.fastjson2.JSONArray;
import java.util.ArrayList;
import java.util.List;
public class TaskPoolUpdateBean {
public static class TaskPoolNodeAdd extends BaseBean
{
public String parentId;
public List<TaskPoolNode> nodes = new ArrayList<>();
}
public static class TaskPoolNodeExtraAdd extends BaseBean
{
public String nodeId;
public List<TaskPoolNodeExtra> nodeExtras;
}
public static class TaskPoolItemAdd extends BaseBean
{
public String nodeId;
public List<TaskPoolItem> tasks;
}
public static class TaskPoolItemExtraAdd extends BaseBean
{
public String nodeId;
public String taskId;
public List<TaskPoolItemExtra> taskExtras;
}
public static class TaskPoolPerformanceAdd extends BaseBean
{
public String nodeId;
public String taskId;
public List<TaskPoolPerformance> performances;
}
public static class TaskPoolPerformanceExtraAdd extends BaseBean
{
public String nodeId;
public String taskId;
public String performanceId;
public List<TaskPoolPerformanceExtra> performanceExtras;
}
public boolean bNewVersion = false;
public int versionType = 0; //0：生成小版本 1：生成大版本
public TaskPoolBrief poolBrief;
public List<TaskPoolNodeAdd> addNodes = new ArrayList<>();
public JSONArray addNodeArray;
//public List<TaskPoolNodeExtraAdd> addNodeExtras;
public List<TaskPoolNodeExtra> addNodeExtras;
public List<TaskPoolItemAdd> addTasks = new ArrayList<>();
public JSONArray addTaskArray;
//public List<TaskPoolItemExtraAdd> addTaskExtras;
public List<TaskPoolItemExtra> addTaskExtras;
public List<TaskPoolPerformanceAdd> addPerformances;
// public List<TaskPoolPerformanceExtraAdd> addPerformanceExtras;
public List<TaskPoolPerformanceExtra> addPerformanceExtras;
public List<TaskPoolNode> updateNodes;
public List<TaskPoolNodeExtra> updateNodeExtras;
public List<TaskPoolItem> updateTasks;
public List<TaskPoolItemExtra> updateTaskExtras;
public List<TaskPoolPerformance> updatePerformances;
public List<TaskPoolPerformanceExtra> updatePerformanceExtras;
public List<String> deleteNodes;
public List<String> deleteNodeExtras;
public List<String> deleteTasks;
public List<String> deleteTaskExtras;
public List<String> deletePerformances;
public List<String> deletePerformanceExtras;
}

15
task/src/main/java/com/sdm/task/model/bo/TaskPoolVersion.java
View File

@@ -1,15 +0,0 @@
package com.sdm.task.model.bo;
public class TaskPoolVersion extends BaseBean{
public TaskPoolVersion()
{
init();
}
public String poolName;
public String poolVersion;
public String parentVersion;
public String childVersion;
public String versionContents;
public String creator;
public String createTime;
}

74
task/src/main/java/com/sdm/task/model/dto/TaskPerformanceDto.java Normal file
View File

@@ -0,0 +1,74 @@
package com.sdm.task.model.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
@Data
@Schema(description = "任务性能DTO")
public class TaskPerformanceDto {
@Schema(description = "UUID")
private String uuid;
@Schema(description = "任务ID")
private String taskId;
@Schema(description = "节点ID")
private String nodeId;
@Schema(description = "性能名称")
private String performanceName;
@Schema(description = "节点名称")
private String nodeName;
@Schema(description = "英文名称")
private String englishName;
@Schema(description = "节点编码")
private String nodeCode;
@Schema(description = "池名称")
private String poolName;
@Schema(description = "性能类型")
private String performanceType;
@Schema(description = "单位")
private String unit;
@Schema(description = "目标值")
private String targetValue;
@Schema(description = "最低值")
private String lowValue;
@Schema(description = "最高值")
private String highValue;
@Schema(description = "方法")
private String method;
@Schema(description = "描述")
private String description;
@Schema(description = "任务名称")
private String taskName;
@Schema(description = "标准")
private String standard;
@Schema(description = "租户ID")
private String tenantId;
@Schema(description = "创建时间")
private LocalDateTime createTime;
@Schema(description = "父ID")
private Integer pid;
}

19
task/src/main/java/com/sdm/task/model/req/BatchAddTaskPerformanceReq.java Normal file
View File

@@ -0,0 +1,19 @@
package com.sdm.task.model.req;
import com.sdm.task.model.dto.TaskPerformanceDto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import java.util.List;
@Data
public class BatchAddTaskPerformanceReq {
@NotNull
@Schema(description = "任务id")
Integer taskId;
@Schema(description = "性能指标列表")
List<TaskPerformanceDto> performanceList;
}

20
task/src/main/java/com/sdm/task/service/ISimulationPerformanceService.java
View File

@@ -3,10 +3,13 @@ package com.sdm.task.service;
import com.sdm.common.common.SdmResponse;
import com.sdm.task.model.entity.SimulationPerformance;
import com.baomidou.mybatisplus.extension.service.IService;
import com.sdm.task.model.req.BatchAddTaskPerformanceReq;
import java.util.List;
/**
* <p>
* 服务类
* 服务类
* </p>
*
* @author author
@@ -14,4 +17,19 @@ import com.baomidou.mybatisplus.extension.service.IService;
*/
public interface ISimulationPerformanceService extends IService<SimulationPerformance> {
SdmResponse getTaskPerformance(Integer taskId);
/**
* 批量新增任务性能指标
*
* @return 操作结果
*/
SdmResponse batchAddTaskPerformance(BatchAddTaskPerformanceReq batchAddTaskPerformanceReq);
/**
* 批量删除任务性能指标
*
* @param performanceIds 指标ids
* @return 操作结果
*/
SdmResponse batchDeleteTaskPerformance(List<Integer> performanceIds);
}

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

@@ -19,6 +19,8 @@ public interface ISimulationTaskPoolService {
SdmResponse getSimulationPoolPerformance(String poolName);
SdmResponse getSimulationPoolTasks(String poolName,String version);
SdmResponse getTaskPoolVersions(String poolName);
SdmResponse cleanTaskPool(String poolName);

55
task/src/main/java/com/sdm/task/service/impl/SimulationPerformanceServiceImpl.java
View File

@@ -1,20 +1,25 @@
package com.sdm.task.service.impl;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.service.BaseService;
import com.sdm.task.model.dto.TaskPerformanceDto;
import com.sdm.task.model.entity.SimulationPerformance;
import com.sdm.task.dao.SimulationPerformanceMapper;
import com.sdm.task.model.entity.SimulationTask;
import com.sdm.task.model.req.BatchAddTaskPerformanceReq;
import com.sdm.task.service.ISimulationPerformanceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sdm.task.service.ISimulationTaskService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* <p>
* 服务实现类
* 服务实现类
* </p>
*
* @author author
@@ -35,4 +40,52 @@ public class SimulationPerformanceServiceImpl extends ServiceImpl<SimulationPerf
List<SimulationPerformance> list = this.lambdaQuery().eq(SimulationPerformance::getTaskId, simulationTask.getUuid()).list();
return SdmResponse.success(list);
}
@Override
public SdmResponse batchAddTaskPerformance(BatchAddTaskPerformanceReq batchAddTaskPerformanceReq) {
// 查询任务信息
SimulationTask simulationTask = simulationTaskService.lambdaQuery()
.eq(SimulationTask::getId, batchAddTaskPerformanceReq.getTaskId())
.one();
if (simulationTask == null) {
return SdmResponse.failed("未查询到任务");
}
List<TaskPerformanceDto> performanceList = batchAddTaskPerformanceReq.getPerformanceList();
List<SimulationPerformance> simulationPerformanceList = new ArrayList<>();
// 设置每个性能指标的taskId为任务的uuid
for (TaskPerformanceDto performance : performanceList) {
SimulationPerformance simulationPerformance = new SimulationPerformance();
BeanUtils.copyProperties(performance, simulationPerformance);
simulationPerformance.setUuid(BaseService.generateUuid());
simulationPerformance.setTaskId(simulationTask.getUuid());
simulationPerformance.setTaskName(simulationTask.getTaskName());
simulationPerformanceList.add(simulationPerformance);
}
// 批量保存性能指标
boolean success = this.saveBatch(simulationPerformanceList);
if (success) {
return SdmResponse.success("批量新增成功");
} else {
return SdmResponse.failed("批量新增失败");
}
}
@Override
public SdmResponse batchDeleteTaskPerformance(List<Integer> performanceIds) {
// 删除该任务UUID关联的所有性能指标
boolean success = this.lambdaUpdate()
.in(SimulationPerformance::getId, performanceIds)
.remove();
if (success) {
return SdmResponse.success("批量删除成功");
} else {
return SdmResponse.failed("批量删除失败");
}
}
}

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

@@ -3,6 +3,7 @@ package com.sdm.task.service.impl;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.json.JsonMapper;
import com.sdm.common.common.ResultCode;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.service.BaseService;
@@ -13,10 +14,14 @@ import com.sdm.task.model.entity.*;
import com.sdm.task.service.ISimulationTaskPoolService;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.*;
import java.net.URLEncoder;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -1238,6 +1243,157 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
return response;
}
/**
* 获取节点下分析项
* @param nodeObject
* @return
*/
private List<TaskPoolItem> getTaskPoolNodeItem(JSONObject nodeObject)
{
List<TaskPoolItem> tasks = new ArrayList<>();
JSONArray children = nodeObject.getJSONArray("children");
if(children != null)
{
for(int index=0; index<children.size(); index++)
{
JSONObject childObj = children.getJSONObject(index);
String childType = childObj.getString("levelType");
if(childType.equals("node"))
{
List<TaskPoolItem> childNodeTasks = getTaskPoolNodeItem(childObj);
tasks.addAll(childNodeTasks);
}
else if(childType.equals("task"))
{
ObjectMapper objectMapper = new ObjectMapper();
try {
TaskPoolItem poolItem = objectMapper.readValue(childObj.toJSONString(),TaskPoolItem.class);
tasks.add(poolItem);
}
catch (Exception ex)
{
ex.printStackTrace();
}
}
}
}
return tasks;
}
@Override
public SdmResponse getSimulationPoolTasks(String poolName,String version)
{
SdmResponse response = SdmResponse.success();
JSONObject poolJson = null;
if(version==null || version.length()==0)
{
SdmResponse poolTreeResponse = getCurrentPoolTree(poolName);
if(poolTreeResponse.getCode() != ResultCode.SUCCESS.getCode())
{
response = SdmResponse.failed("获取分析项库失败");
return response;
}
else
{
TaskPoolTree poolTree = (TaskPoolTree) poolTreeResponse.getData();
poolJson = JSONObject.from(poolTree);
}
}
else
{
String versionContents = mapper.queryTaskPoolVersionContent(poolName,version);
if(versionContents == null || versionContents.length() == 0)
{
response = SdmResponse.failed("分析项库版本不存在");
return response;
}
else
{
poolJson = JSONObject.parseObject(versionContents);
}
}
List<TaskPoolItem> tasks = new ArrayList<>();
JSONArray nodeArray = poolJson.getJSONArray("nodes");
if(nodeArray != null)
{
for(int index=0; index<nodeArray.size(); index++)
{
JSONObject nodeObj = nodeArray.getJSONObject(index);
List<TaskPoolItem> nodeTasks = getTaskPoolNodeItem(nodeObj);
tasks.addAll(nodeTasks);
}
}
////////////
/*List<TaskPoolItem> taskPoolItems = mapper.queryTaskPoolItems(poolName);
List<TaskPoolPerformance> poolPerformances = mapper.queryTaskPoolPerformances(poolName);
List<TaskPoolItemExtra> taskPoolItemExtras = mapper.queryTaskPoolItemExtras(poolName);
List<TaskPoolPerformanceExtra> taskPoolPerformanceExtras = mapper.queryTaskPoolPerformanceExtras(poolName);
Map<String,List<TaskPoolPerformance>> taskPoolPerformanceMap = new HashMap<>();
Map<String,List<TaskPoolItemExtra>> taskPoolItemExtraMap = new HashMap<>();
Map<String,List<TaskPoolPerformanceExtra>> taskPoolPerformanceExtraMap = new HashMap<>();
//整理性能指标附加属性
for(TaskPoolPerformanceExtra performanceExtra : taskPoolPerformanceExtras)
{
String performanceUuid = performanceExtra.performanceId;
List<TaskPoolPerformanceExtra> extras = taskPoolPerformanceExtraMap.get(performanceUuid);
if(extras == null)
{
extras = new ArrayList<>();
taskPoolPerformanceExtraMap.put(performanceUuid,extras);
}
extras.add(performanceExtra);
}
//整理分析项附加属性
for(TaskPoolItemExtra itemExtra : taskPoolItemExtras)
{
String taskUUid = itemExtra.taskId;
List<TaskPoolItemExtra> extras = taskPoolItemExtraMap.get(taskUUid);
if(extras == null)
{
extras = new ArrayList<>();
taskPoolItemExtraMap.put(taskUUid,extras);
}
extras.add(itemExtra);
}
//整理性能指标
for(TaskPoolPerformance performance : poolPerformances)
{
//获取附加属性
List<TaskPoolPerformanceExtra> performanceExtras = taskPoolPerformanceExtraMap.get(performance.uuid);
if(performanceExtras != null)
{
performance.extras = performanceExtras;
}
String taskUuid = performance.taskId;
List<TaskPoolPerformance> performances = taskPoolPerformanceMap.get(taskUuid);
if(performances == null)
{
performances = new ArrayList<>();
taskPoolPerformanceMap.put(taskUuid,performances);
}
performances.add(performance);
}
//整理分析项
for(TaskPoolItem poolItem : taskPoolItems)
{
//获取分析项附加属性
List<TaskPoolItemExtra> itemExtras = taskPoolItemExtraMap.get(poolItem.uuid);
if(itemExtras != null)
{
poolItem.extras = itemExtras;
}
//获取分析项性能指标
List<TaskPoolPerformance> performances = taskPoolPerformanceMap.get(poolItem.uuid);
if(performances != null)
{
poolItem.performances = performances;
}
}*/
response.setData(tasks);
return response;
}
@Override
public SdmResponse exportTaskPool(HttpServletResponse httpServletResponse,JSONObject paramObject) {
String poolName = paramObject.getString("poolName");

2
task/src/main/resources/application-dev.yml
View File

@@ -103,6 +103,6 @@ lombok:
file:
rootPath: /data/home/sdm
scriptPath : D:\\scripts
scriptPath : /opt/script
#logging:
# config: ./config/logback.xml