From 3877b745d840ef7b9be53931293e504cece995ca Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Fri, 6 Mar 2026 16:32:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E5=91=8A=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=B7=A5=E5=86=B5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/dto/ReportTemplateDto.java | 10 ++- .../entity/SimulationReportTemplate.java | 7 ++ .../SimulationReportTemplateServiceImpl.java | 74 +++++++++++++++++++ .../common/entity/pojo/task/TaskBaseInfo.java | 2 + .../controller/SystemLogController.java | 7 +- .../sdm/task/dao/SimulationPoolMapper.java | 4 +- .../SimulatePoolTaskFlowTemplateRelate.java | 2 + .../impl/SimulationTaskPoolServiceImpl.java | 1 + 8 files changed, 100 insertions(+), 7 deletions(-) diff --git a/capability/src/main/java/com/sdm/capability/model/dto/ReportTemplateDto.java b/capability/src/main/java/com/sdm/capability/model/dto/ReportTemplateDto.java index ad317581..d0ae860c 100644 --- a/capability/src/main/java/com/sdm/capability/model/dto/ReportTemplateDto.java +++ b/capability/src/main/java/com/sdm/capability/model/dto/ReportTemplateDto.java @@ -1,11 +1,13 @@ package com.sdm.capability.model.dto; import com.fasterxml.jackson.annotation.JsonFormat; +import com.sdm.capability.model.entity.SimulationFlowTaskBindInfo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.web.multipart.MultipartFile; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; @Data @@ -89,5 +91,11 @@ public class ReportTemplateDto { @Schema(description = "是否复制模板 Y/N") private String copyFlag; - + + @Schema(description = "绑定的工况库信息") + public List simulationPoolInfoList = new ArrayList(); + + @Schema(description = "绑定的工况库信息JSON字符串") + public String simulationPoolInfoListStr; + } diff --git a/capability/src/main/java/com/sdm/capability/model/entity/SimulationReportTemplate.java b/capability/src/main/java/com/sdm/capability/model/entity/SimulationReportTemplate.java index 59c4192d..93002bc1 100644 --- a/capability/src/main/java/com/sdm/capability/model/entity/SimulationReportTemplate.java +++ b/capability/src/main/java/com/sdm/capability/model/entity/SimulationReportTemplate.java @@ -11,6 +11,8 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; @Data @EqualsAndHashCode(callSuper = false) @@ -94,4 +96,9 @@ public class SimulationReportTemplate implements Serializable { @TableField("updater") private Long updater; + // ========== 新增非数据库字段 ========== + @ApiModelProperty(value = "绑定的工况库信息") + @TableField(exist = false) + private List simulationPoolInfoList = new ArrayList<>(); + } diff --git a/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java b/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java index 493b5bcd..28fd87e2 100644 --- a/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java +++ b/capability/src/main/java/com/sdm/capability/service/impl/SimulationReportTemplateServiceImpl.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.sdm.capability.dao.SimulationReportTemplateMapper; import com.sdm.capability.model.dto.ReportTemplateDto; +import com.sdm.capability.model.entity.SimulationFlowTaskBindInfo; +import com.sdm.capability.model.entity.SimulationFlowTemplate; import com.sdm.capability.model.entity.SimulationReportTemplate; import com.sdm.capability.service.ISimulationReportTemplateService; import com.sdm.common.common.SdmResponse; @@ -16,15 +18,19 @@ import com.sdm.common.entity.constants.CommonConstants; import com.sdm.common.entity.constants.NumberConstants; import com.sdm.common.entity.enums.ApproveStatusEnum; import com.sdm.common.entity.enums.ApproveTypeEnum; +import com.sdm.common.entity.pojo.task.FlowBindTaskPoolItem; +import com.sdm.common.entity.pojo.task.TaskBaseInfo; import com.sdm.common.entity.req.data.DelFileReq; import com.sdm.common.entity.req.data.GetFileBaseInfoReq; import com.sdm.common.entity.req.data.UpdateScriptAndReportReq; import com.sdm.common.entity.req.data.UploadFilesReq; import com.sdm.common.entity.req.system.LaunchApproveReq; +import com.sdm.common.entity.req.task.BindTaskAndFlowTemplateReq; import com.sdm.common.entity.resp.capability.ReportTemplateResp; import com.sdm.common.entity.resp.data.FileMetadataInfoResp; import com.sdm.common.feign.impl.data.DataClientFeignClientImpl; import com.sdm.common.feign.impl.system.ApproveFeignClientImpl; +import com.sdm.common.feign.impl.task.SimuluationTaskPoolFeignClientImpl; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -49,6 +55,9 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl simulationPoolInfoList = JSON.parseArray(templateDto.getSimulationPoolInfoListStr(), SimulationFlowTaskBindInfo.class); + // 绑定工况 + bindReportTemplateAndTask(reportTemplate.getTemplateCode(), simulationPoolInfoList); + } return SdmResponse.success(reportTemplate.getUuid()); } + /** + * 绑定报告模版与分析库中的分析项 + * @param reportCode + * @param simulationPoolInfoList + */ + private void bindReportTemplateAndTask(String reportCode, List simulationPoolInfoList) + { + if(simulationPoolInfoList == null || simulationPoolInfoList.isEmpty()) + return; + BindTaskAndFlowTemplateReq req = new BindTaskAndFlowTemplateReq(); + req.flowCode = reportCode; + req.bindTaskkPoolItem = new ArrayList<>(); + for(SimulationFlowTaskBindInfo bindInfo : simulationPoolInfoList) + { + FlowBindTaskPoolItem bindTaskPoolItem = new FlowBindTaskPoolItem(); + bindTaskPoolItem.flowCode = reportCode; + bindTaskPoolItem.poolName = bindInfo.simulationPoolName; + bindTaskPoolItem.poolId = bindInfo.simulationPoolId; + bindTaskPoolItem.version = bindInfo.simulationPoolVersion; + for(String taskId : bindInfo.simulationPoolTaskIds) + { + TaskBaseInfo taskBaseInfo = new TaskBaseInfo(); + taskBaseInfo.poolName = bindInfo.simulationPoolName; + taskBaseInfo.version = bindInfo.simulationPoolVersion; + taskBaseInfo.type = 1; + taskBaseInfo.uuid = taskId; + bindTaskPoolItem.taskList.add(taskBaseInfo); + } + req.bindTaskkPoolItem.add(bindTaskPoolItem); + } + + simuluationTaskPoolFeignClient.updateTaskAndFlowTemplate(req); + } + @Override public SdmResponse upgradeReportTemplate(ReportTemplateDto templateDto) { Long tenantId = ThreadLocalContext.getTenantId(); @@ -249,6 +298,31 @@ public class SimulationReportTemplateServiceImpl extends ServiceImpl flowBindTaskPoolItems = (List)bindResponse.getData(); + for(FlowBindTaskPoolItem flowBindTaskPoolItem : flowBindTaskPoolItems) + { + SimulationFlowTaskBindInfo flowTaskBindInfo = new SimulationFlowTaskBindInfo(); + flowTaskBindInfo.simulationPoolName = flowBindTaskPoolItem.poolName; + flowTaskBindInfo.simulationPoolId = flowBindTaskPoolItem.poolId; + flowTaskBindInfo.simulationPoolVersion = flowBindTaskPoolItem.version; + flowTaskBindInfo.taskBaseInfoList = flowBindTaskPoolItem.taskList; + List taskIds = new ArrayList<>(); + for(TaskBaseInfo taskBaseInfo : flowBindTaskPoolItem.taskList) + { + taskIds.add(taskBaseInfo.uuid); + } + flowTaskBindInfo.simulationPoolTaskIds = taskIds; + reportTemplate.getSimulationPoolInfoList().add(flowTaskBindInfo); + } + } + } + DataPageInfo> pageInfo = new DataPageInfo<>(); pageInfo.data = queryTemplate; pageInfo.total = total; diff --git a/common/src/main/java/com/sdm/common/entity/pojo/task/TaskBaseInfo.java b/common/src/main/java/com/sdm/common/entity/pojo/task/TaskBaseInfo.java index b9d6e13b..04ed4bda 100644 --- a/common/src/main/java/com/sdm/common/entity/pojo/task/TaskBaseInfo.java +++ b/common/src/main/java/com/sdm/common/entity/pojo/task/TaskBaseInfo.java @@ -20,4 +20,6 @@ public class TaskBaseInfo { public Long fileId; + public Integer type; + } diff --git a/system/src/main/java/com/sdm/system/controller/SystemLogController.java b/system/src/main/java/com/sdm/system/controller/SystemLogController.java index b0a5dea0..fe99758c 100644 --- a/system/src/main/java/com/sdm/system/controller/SystemLogController.java +++ b/system/src/main/java/com/sdm/system/controller/SystemLogController.java @@ -80,9 +80,8 @@ public class SystemLogController implements ISysLogFeignClient { * @param createTimeArr 时间数组 [startDate, endDate]，格式：yyyy-MM-dd * @return 每日操作统计列表 */ - @GetMapping("/getDailyOperateStatistics") - public SdmResponse> getDailyOperateStatistics( - @RequestParam("createTimeArr") @NotNull(message = "时间不能为空") String[] createTimeArr) { - return logService.getDailyOperateStatistics(createTimeArr); + @PostMapping("/getDailyOperateStatistics") + public SdmResponse> getDailyOperateStatistics(@RequestBody SysLogDTO sysLog) { + return logService.getDailyOperateStatistics(sysLog.getCreateTimeArr()); } } diff --git a/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java b/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java index 3831cc2d..cdf47f21 100644 --- a/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java +++ b/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java @@ -229,9 +229,9 @@ public interface SimulationPoolMapper { @Insert({ "" }) diff --git a/task/src/main/java/com/sdm/task/model/entity/SimulatePoolTaskFlowTemplateRelate.java b/task/src/main/java/com/sdm/task/model/entity/SimulatePoolTaskFlowTemplateRelate.java index b2987e2d..de482584 100644 --- a/task/src/main/java/com/sdm/task/model/entity/SimulatePoolTaskFlowTemplateRelate.java +++ b/task/src/main/java/com/sdm/task/model/entity/SimulatePoolTaskFlowTemplateRelate.java @@ -14,6 +14,8 @@ public class SimulatePoolTaskFlowTemplateRelate { public String flowCode; + public Integer type; + public long tenantId; public long creator; diff --git a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java index 5c0d2cc1..c1e5d654 100644 --- a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java +++ b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java @@ -2297,6 +2297,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul templateRelate.version = taskPoolItem.version; templateRelate.poolId = taskPoolItem.poolId; templateRelate.taskUuid = taskBaseInfo.uuid; + templateRelate.type = taskBaseInfo.type; relations.add(templateRelate); } }