Merge remote-tracking branch 'origin/main'

This commit is contained in:
2026-01-12 16:25:13 +08:00
10 changed files with 134 additions and 59 deletions

View File

@@ -0,0 +1,22 @@
package com.sdm.common.entity.req.project;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.Data;
import java.util.List;
@Data
public class SpdmQueryRunListReq {
/**
* 选中的节点id
*/
private List<String> nodeIdList;
/**
* 选中的节点类型
*/
private String nodeType;
}

View File

@@ -0,0 +1,11 @@
package com.sdm.common.entity.resp.project;
import lombok.Data;
import java.util.ArrayList;
@Data
public class RunListByNodeIdResp {
Integer total;
ArrayList<String> list;
}

View File

@@ -3,6 +3,7 @@ package com.sdm.common.feign.impl.project;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.req.project.DelNodeReq;
import com.sdm.common.entity.req.project.SpdmNodeListReq;
import com.sdm.common.entity.req.project.SpdmQueryRunListReq;
import com.sdm.common.entity.resp.AllNodeByProjectIdAndTypeResp;
import com.sdm.common.entity.resp.project.SimulationNodeResp;
import com.sdm.common.feign.inter.project.ISimulationNodeFeignClient;
@@ -143,5 +144,17 @@ public class SimulationNodeFeignClientImpl implements ISimulationNodeFeignClient
return response;
}
@Override
public SdmResponse<List<String>> getRunListByNodeId(SpdmQueryRunListReq req) {
try {
SdmResponse<List<String>> runListByNodeId = ISimulationNodeFeignClient.getRunListByNodeId(req);
if (!runListByNodeId.isSuccess()){
return SdmResponse.failed("查询失败");
}
return runListByNodeId;
} catch (Exception e) {
log.error("查询失败", e);
return SdmResponse.failed("查询失败");
}
}
}

View File

@@ -3,9 +3,12 @@ package com.sdm.common.feign.inter.project;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.req.project.DelNodeReq;
import com.sdm.common.entity.req.project.SpdmNodeListReq;
import com.sdm.common.entity.req.project.SpdmQueryRunListReq;
import com.sdm.common.entity.resp.AllNodeByProjectIdAndTypeResp;
import com.sdm.common.entity.resp.project.SimulationNodeResp;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -56,4 +59,15 @@ public interface ISimulationNodeFeignClient {
@PostMapping(value = "/node/querySimulationNodeByUuids")
SdmResponse<List<SimulationNodeResp>> querySimulationNodeByUuids(@RequestBody List<String>uuids);
/**
* 根据节点id查询所有算例
*
* @param req
* @return
*/
@PostMapping("/getRunListByNodeId")
SdmResponse<List<String>> getRunListByNodeId(@RequestBody SpdmQueryRunListReq req);
}

View File

@@ -0,0 +1,34 @@
package com.sdm.common.service;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.bo.DataDictionary;
import com.sdm.common.entity.constants.TagConstant;
import com.sdm.common.feign.impl.system.SysConfigFeignClientImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static java.util.Collections.emptyMap;
@Service
@Slf4j
public class TagMapService {
@Autowired
private SysConfigFeignClientImpl sysConfigFeignClient;
public Map<String, String> getTagMapName() {
SdmResponse<List<DataDictionary>> tagMapList = sysConfigFeignClient.getDictionaryData(TagConstant.DICTIONARY_TAG_KEY);
if (!tagMapList.isSuccess() || ObjectUtils.isEmpty(tagMapList.getData())) {
log.error("字典信息查询失败");
return emptyMap();
}
// project-->tag1 phase-->tag2
return tagMapList.getData().stream().collect(Collectors.toMap(DataDictionary::getDictValue, DataDictionary::getDictName));
}
}