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

修改导出分析项库异常，仿真流程模版查询bug，宜安controller中添加查询用户列表接口

Browse Source
This commit is contained in:
daiqy88
2025-12-29 16:07:10 +08:00
parent d7e2c6ca78
commit 704c1a4333
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
capability/src/main/java/com/sdm/capability/service/impl/FlowServiceImpl.java
View File

@@ -287,7 +287,7 @@ public class FlowServiceImpl extends BaseService implements IFlowService {
condition += " AND templateName LIKE '%"+templateName+"%' ";
}
if(templateStatus >= 0)
if(templateStatus >= -1)
{
condition += " AND templateStatus="+templateStatus;
}
@@ -307,7 +307,6 @@ public class FlowServiceImpl extends BaseService implements IFlowService {
}
long userId = ThreadLocalContext.getUserId();
condition += " AND creator="+userId;
}
String beginTime = "";
String endTime = "";

12
project/src/main/java/com/sdm/project/controller/YAModelController.java
View File

@@ -12,8 +12,10 @@ import com.sdm.common.entity.enums.NodeTypeEnum;
import com.sdm.common.entity.req.data.GetSimulationTaskFileReq;
import com.sdm.common.entity.req.data.UploadFilesReq;
import com.sdm.common.entity.req.system.UserQueryReq;
import com.sdm.common.entity.resp.PageDataResp;
import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
import com.sdm.common.entity.resp.system.CIDUserResp;
import com.sdm.common.feign.impl.data.DataAnalysisFeignClientImpl;
import com.sdm.common.feign.inter.data.IDataFeignClient;
@@ -31,6 +33,7 @@ import com.sdm.project.service.INodeService;
import com.sdm.project.service.ITaskService;
import com.sdm.project.service.ISimulationRunService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -447,6 +450,15 @@ public class YAModelController {
return response;
}
@Operation(summary = "根据用户ids查询用户列表")
@PostMapping("/listUserByIds")
public SdmResponse<List<CIDUserResp>> listUserByIds(@Parameter(description = "用户查询请求参数") @RequestBody UserQueryReq req) {
SdmResponse<List<CIDUserResp>> response = SdmResponse.success();
List<CIDUserResp> cidUsers = new ArrayList<>();
response.setData(cidUsers);
return response;
}
/**
* 生成获取CID前端token验证公钥token
* @return

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

@@ -2054,7 +2054,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul
String poolName = paramObject.getString("poolName");
String version = paramObject.getString("poolVersion");
String dicts = paramObject.getString("dicts");
String colunms = paramObject.getString("colunms");
String colunms = paramObject.getString("columns");
SdmResponse response = SdmResponse.success();
SdmResponse poolTreeResponse = getPoolTreeByVersion(poolName,version);
if(poolTreeResponse.getCode() != ResultCode.SUCCESS.getCode())