From 7acd39f0feb8443971e270adbf939c25f561f35d Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Tue, 16 Dec 2025 09:10:45 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81bug=20fix=202=E3=80=81=E5=88=A9?= =?UTF-8?q?=E5=85=83=E4=BA=A8=E2=80=94=E2=80=94=E4=BB=BF=E7=9C=9F=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sdm/common/config/CommonConfig.java | 32 ++++ .../common/entity/enums/ValueTypeEnum.java | 17 ++ .../entity/pojo/lyric/TodoEmulationInfo.java | 74 +++++++++ .../service/lyric/LyricIntegrateService.java | 80 ++++++++-- common/src/main/resources/common.yml | 23 +++ .../SimulationLyricNodeController.java | 10 +- .../sdm/project/model/po/ProjectNodePo.java | 1 + .../project/model/req/SpdmTaskListReq.java | 2 + .../sdm/project/model/req/SpdmTaskOprReq.java | 9 ++ .../service/impl/DemandServiceImpl.java | 6 +- .../service/impl/ProjectServiceImpl.java | 12 +- .../project/service/impl/TaskServiceImpl.java | 149 ++++++++++-------- .../resources/mapper/SimulationTaskMapper.xml | 8 + 13 files changed, 344 insertions(+), 79 deletions(-) create mode 100644 common/src/main/java/com/sdm/common/config/CommonConfig.java create mode 100644 common/src/main/java/com/sdm/common/entity/enums/ValueTypeEnum.java create mode 100644 common/src/main/java/com/sdm/common/entity/pojo/lyric/TodoEmulationInfo.java create mode 100644 common/src/main/resources/common.yml diff --git a/common/src/main/java/com/sdm/common/config/CommonConfig.java b/common/src/main/java/com/sdm/common/config/CommonConfig.java new file mode 100644 index 00000000..003ce1a2 --- /dev/null +++ b/common/src/main/java/com/sdm/common/config/CommonConfig.java @@ -0,0 +1,32 @@ +// common模块：com.xxx.common.config.CommonConfig +package com.sdm.common.config; + +import org.springframework.boot.env.YamlPropertySourceLoader; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.core.io.support.DefaultPropertySourceFactory; +import org.springframework.core.io.support.EncodedResource; + +import java.io.IOException; +import java.util.List; + +/** + * 加载common模块的自定义配置文件 + * encoding：解决中文乱码 + */ +@Configuration +@PropertySource(value = "classpath:common.yml", factory = CommonConfig.YamlPropertySourceFactory.class) +public class CommonConfig { + // 自定义YamlPropertySourceFactory，解决@PropertySource不支持yml的问题 + public static class YamlPropertySourceFactory extends DefaultPropertySourceFactory { + @Override + public org.springframework.core.env.PropertySource createPropertySource(String name, EncodedResource resource) throws IOException { + if (resource == null) { + return super.createPropertySource(name, resource); + } + List> sources = new YamlPropertySourceLoader() + .load(resource.getResource().getFilename(), resource.getResource()); + return sources.get(0); + } + } +} \ No newline at end of file diff --git a/common/src/main/java/com/sdm/common/entity/enums/ValueTypeEnum.java b/common/src/main/java/com/sdm/common/entity/enums/ValueTypeEnum.java new file mode 100644 index 00000000..a07f4174 --- /dev/null +++ b/common/src/main/java/com/sdm/common/entity/enums/ValueTypeEnum.java @@ -0,0 +1,17 @@ +package com.sdm.common.entity.enums; + + +public enum ValueTypeEnum { + DEFAULT("default") + ; + String value; + + ValueTypeEnum(String i) { + value = i; + } + + public String getValue() { + return value; + } + +} \ No newline at end of file diff --git a/common/src/main/java/com/sdm/common/entity/pojo/lyric/TodoEmulationInfo.java b/common/src/main/java/com/sdm/common/entity/pojo/lyric/TodoEmulationInfo.java new file mode 100644 index 00000000..6714f8f7 --- /dev/null +++ b/common/src/main/java/com/sdm/common/entity/pojo/lyric/TodoEmulationInfo.java @@ -0,0 +1,74 @@ +package com.sdm.common.entity.pojo.lyric; + +import lombok.Data; + +import java.util.Date; + +@Data +public class TodoEmulationInfo { + private Integer id; + private Integer todoId; + private String threeDimensionalPerformer; + private String emulationPerformer; + private String emulationRegistrant; + private String emulationExecutor; + private String emulationType; + private String emulationResult; + private String emulationDemand; + private String robotBrand; + private String axis; + private String beatRequirements; + private String threeDimensionalRepositoryPath; + private String resultPath; + private String resultDescribe; + private String analysisType; + private String analysisNum; + private String emulationTime; + private String software; + private String resultFinishTime; + private String type; + private String createBy; + private String createTime; + private String modify_by; + private String modify_time; + private String result_file_id; + private String difficulty; + private String required_time; + private String isLongTerm; + private String animationUse; + private String limitedUse; + private String emergencyStatement; + private String status; + private String subject; + private String describes; + private String project; + private String performer; + private Date planStartTime; + private Date requirementsTime; + private Date startTime; + private Date finishTime; + private Date pausedTime; + private Date introduceBy; + private Date closedBy; + private Date closedTime; + private String followBy; + private String stationNum; + private String projectName; + private String projectModel; + private String projectStage; + private String verifierNo; + private String progress; + private String todoNum; + private String progressDescription; + private String realWorkHour; + private String verifier; + private String followByName; + private String performerName; + private String workHouPlan; + private String introduceByName; + private String turnDownReason; + private String projectType; + private String projectGroup; + private String finishedBy; + private String standardWorkHour; +} diff --git a/common/src/main/java/com/sdm/common/service/lyric/LyricIntegrateService.java b/common/src/main/java/com/sdm/common/service/lyric/LyricIntegrateService.java index 828d6520..b8d86c7e 100644 --- a/common/src/main/java/com/sdm/common/service/lyric/LyricIntegrateService.java +++ b/common/src/main/java/com/sdm/common/service/lyric/LyricIntegrateService.java @@ -2,7 +2,9 @@ package com.sdm.common.service.lyric; import com.alibaba.fastjson2.JSONObject; import com.sdm.common.common.SdmResponse; +import com.sdm.common.entity.pojo.lyric.TodoEmulationInfo; import com.sdm.common.utils.HttpUtil; +import lombok.extern.slf4j.Slf4j; import org.apache.http.client.HttpClient; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; @@ -18,6 +20,8 @@ import org.apache.http.impl.client.HttpClientBuilder; import org.apache.http.impl.client.HttpClients; import org.apache.http.ssl.SSLContextBuilder; import org.apache.http.util.EntityUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.stereotype.Service; import org.springframework.util.DigestUtils; @@ -27,32 +31,49 @@ import java.nio.charset.StandardCharsets; import java.security.KeyManagementException; import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; +import java.sql.*; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.Date; import java.util.HashMap; import java.util.Map; @Service +@Slf4j +@RefreshScope public class LyricIntegrateService { //测试开发环境 - private final String appKey = "e9eb516aa02a43a29e227a0d901ec5f1"; + @Value("${appKey}") + private String appKey; - private final String appSecret = "9fac43db08634aaf8a9fe5fb9468de9d"; + @Value("${appSecret}") + private String appSecret; //海葵云url - private final String HK_CLOUD_URL = "https://v15.lyh.haikuicloud.com"; + @Value("${HK_CLOUD_URL}") + private String HK_CLOUD_URL; //海葵云获取用户token url后缀 - private final String HK_USER_TOKEN_URL_SUFFIX = "/merchant/openapi/user/login/jobNo"; + @Value("${HK_USER_TOKEN_URL_SUFFIX}") + private String HK_USER_TOKEN_URL_SUFFIX; //海葵云获取单个用户信息url后缀 - private final String HK_SIMPLE_USER_URL_SUFFIX = "/merchant/api/user/getSimpleUserInfo"; + @Value("${HK_SIMPLE_USER_URL_SUFFIX}") + private String HK_SIMPLE_USER_URL_SUFFIX; //海葵云上传文件url后缀 - private final String HK_UPLOAD_FILE_URL_SUFFIX = "/haikui-oa/autoCreateFlow/uploadFile"; + @Value("${HK_UPLOAD_FILE_URL_SUFFIX}") + private String HK_UPLOAD_FILE_URL_SUFFIX; //EP系统URL - private final String EP_URL = "https://ep-url.dev.haikuicloud.com"; + @Value("${EP_URL}") + private String EP_URL; //推送代办状态url后缀 - private final String QUERY_TODO_STATUS_SUFFIX = "/todoApi/todo/emulation/dm/status"; + @Value("${QUERY_TODO_STATUS_SUFFIX}") + private String QUERY_TODO_STATUS_SUFFIX; //查询待办结果url后缀 - private final String QUERY_TODO_RESULT_SUFFIX = "/todoApi/todo/emulation/dm/result"; + @Value("${QUERY_TODO_RESULT_SUFFIX}") + private String QUERY_TODO_RESULT_SUFFIX; //查询待办附加url后缀 - private final String QUERY_TOD_ATTACHMENT_SUFFIX = "/todoApi/todo/emulation/dm/attachments"; + @Value("${QUERY_TOD_ATTACHMENT_SUFFIX}") + private String QUERY_TOD_ATTACHMENT_SUFFIX; //生产环境 /** @@ -61,6 +82,16 @@ public class LyricIntegrateService { private final String EP_URL = "https://ep-url.lyh.haikuicloud.com; */ + + + @Value("${URL}") + private String URL; + @Value("${USER_NAME}") + private String USERNAME; // 你的 MySQL 用户名 + @Value("${PASSWORD}") + private String PASSWORD; // 你的 MySQL 密码 + + /** * 生成海葵云token签名 * @@ -279,9 +310,32 @@ public class LyricIntegrateService { return null; } - public SdmResponse getTodoList() - { - return null; + /** + * 获取待办列表 + * @return + */ + public SdmResponse getTodoList() { + String todayStartTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(LocalDate.now().atStartOfDay().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli())); + String sql = "SELECT * FROM V_TODO_EMULATION_INFO WHERE create_time > ? AND status = ?"; + // 声明JDBC核心对象（try-with-resources 自动关闭资源） + try (Connection conn = DriverManager.getConnection(URL, USERNAME, PASSWORD)) { + PreparedStatement stmt = conn.prepareStatement(sql); + stmt.setString(1,todayStartTime); + stmt.setString(2,"0"); + // 执行视图查询 + ResultSet rs = stmt.executeQuery(); + while (rs.next()) { + String projectName = rs.getString("projectName"); + String status = rs.getString("status"); + Date createTime = rs.getDate("createTime"); + log.info("projectName为：{}，status：{}，createTime为：{}", projectName, status,createTime); + } + } catch (SQLException e) { + // 异常处理 + System.err.println("JDBC 操作异常：" + e.getMessage()); + log.info(e.getMessage()); + } + return SdmResponse.success(); } diff --git a/common/src/main/resources/common.yml b/common/src/main/resources/common.yml new file mode 100644 index 00000000..2830bab9 --- /dev/null +++ b/common/src/main/resources/common.yml @@ -0,0 +1,23 @@ +# 测试开发环境 +appKey : e9eb516aa02a43a29e227a0d901ec5f1 +appSecret : 9fac43db08634aaf8a9fe5fb9468de9d + # 海葵云url +HK_CLOUD_URL : https:#v15.lyh.haikuicloud.com + #海葵云获取用户token url后缀 +HK_USER_TOKEN_URL_SUFFIX : /merchant/openapi/user/login/jobNo + #海葵云获取单个用户信息url后缀 +HK_SIMPLE_USER_URL_SUFFIX : /merchant/api/user/getSimpleUserInfo + #海葵云上传文件url后缀 +HK_UPLOAD_FILE_URL_SUFFIX : /haikui-oa/autoCreateFlow/uploadFile + #EP系统URL +EP_URL : https:#ep-url.dev.haikuicloud.com + #推送代办状态url后缀 +QUERY_TODO_STATUS_SUFFIX : /todoApi/todo/emulation/dm/status + #查询待办结果url后缀 +QUERY_TODO_RESULT_SUFFIX : /todoApi/todo/emulation/dm/result + #查询待办附加url后缀 +QUERY_TOD_ATTACHMENT_SUFFIX : /todoApi/todo/emulation/dm/attachments + +URL : jdbc:mysql://127.0.0.1:3306/spdm_baseline?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true +USER_NAME : root +PASSWORD : ldy123456 \ No newline at end of file diff --git a/project/src/main/java/com/sdm/project/controller/SimulationLyricNodeController.java b/project/src/main/java/com/sdm/project/controller/SimulationLyricNodeController.java index d47a1b8f..01229a95 100644 --- a/project/src/main/java/com/sdm/project/controller/SimulationLyricNodeController.java +++ b/project/src/main/java/com/sdm/project/controller/SimulationLyricNodeController.java @@ -2,6 +2,7 @@ package com.sdm.project.controller; import com.alibaba.excel.util.StringUtils; import com.sdm.common.common.SdmResponse; +import com.sdm.common.service.lyric.LyricIntegrateService; import com.sdm.project.common.ApprovalStatusEnum; import com.sdm.project.model.entity.SimulationNode; import com.sdm.project.service.ISimulationLyricNodeService; @@ -21,12 +22,19 @@ public class SimulationLyricNodeController { @Autowired private ISimulationLyricNodeService nodeService; + @Autowired + private LyricIntegrateService lyricIntegrateService; + @GetMapping("/updateApprovalStatus") @Operation(summary = "仿真节点审批状态更新", description = "仿真节点审批状态更新") public SdmResponse updateApprovalStatus(@RequestParam(value = "projectName") @Validated String projectName, @RequestParam(value = "workspaceName") @Validated String workspaceName, @RequestParam(value = "approvalStatus") @Validated Integer approvalStatus) { return nodeService.updateApprovalStatus(projectName,workspaceName,approvalStatus); } - + @GetMapping("/getTodoList") + @Operation(summary = "获取待办列表", description = "获取待办列表") + public SdmResponse getTodoList() { + return lyricIntegrateService.getTodoList(); + } } diff --git a/project/src/main/java/com/sdm/project/model/po/ProjectNodePo.java b/project/src/main/java/com/sdm/project/model/po/ProjectNodePo.java index 13299a05..d1dd7749 100644 --- a/project/src/main/java/com/sdm/project/model/po/ProjectNodePo.java +++ b/project/src/main/java/com/sdm/project/model/po/ProjectNodePo.java @@ -164,4 +164,5 @@ public class ProjectNodePo extends NodeAllBase { private Long imageFileId; private String englishName; + private String analyseSoftware; } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java index 586efd13..6d47f923 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmTaskListReq.java @@ -111,4 +111,6 @@ public class SpdmTaskListReq { private Boolean convertTag = true; + private List approvalStatusList; + } diff --git a/project/src/main/java/com/sdm/project/model/req/SpdmTaskOprReq.java b/project/src/main/java/com/sdm/project/model/req/SpdmTaskOprReq.java index 17227f2a..1148536b 100644 --- a/project/src/main/java/com/sdm/project/model/req/SpdmTaskOprReq.java +++ b/project/src/main/java/com/sdm/project/model/req/SpdmTaskOprReq.java @@ -2,8 +2,12 @@ package com.sdm.project.model.req; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import com.sdm.project.model.entity.SimulationTaskExtra; +import com.sdm.project.model.po.TaskNodeExtraPo; import lombok.Data; +import java.util.List; + @JsonIgnoreProperties(ignoreUnknown = true) @Data public class SpdmTaskOprReq { @@ -53,4 +57,9 @@ public class SpdmTaskOprReq { */ private String nodeName; + /** + * 拓展属性 + */ + private List extras; + } diff --git a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java index 58ebf61d..1a8a83a8 100644 --- a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java @@ -10,6 +10,7 @@ import com.sdm.common.entity.ExportExcelFormat; import com.sdm.common.entity.enums.DirTypeEnum; import com.sdm.common.entity.enums.FilePermissionEnum; import com.sdm.common.entity.enums.MessageTemplateEnum; +import com.sdm.common.entity.enums.ValueTypeEnum; import com.sdm.common.entity.req.data.CreateDirReq; import com.sdm.common.entity.req.data.UpdatePermissionReq; import com.sdm.common.entity.req.data.UploadFilesReq; @@ -768,7 +769,10 @@ public class DemandServiceImpl extends BaseService implements IDemandService { } if (CollectionUtils.isNotEmpty(allPerformanceExtraList)) { - allPerformanceExtraList.forEach(projectNode -> projectNode.setCreateTime(createTime)); + for (TaskExtraNode performanceExtraNode : allPerformanceExtraList) { + performanceExtraNode.setCreateTime(createTime); + performanceExtraNode.setValueType(ValueTypeEnum.DEFAULT.getValue()); + } if (projectMapper.batchAddSimulationPerformanceExtra(allPerformanceExtraList) <= 0) { response = SdmResponse.failed("新增任务指标附加属性失败"); return response; diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java index 7817036c..f15837e9 100644 --- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java @@ -10,6 +10,7 @@ import com.sdm.common.entity.ExportExcelFormat; import com.sdm.common.entity.enums.DirTypeEnum; import com.sdm.common.entity.enums.FilePermissionEnum; import com.sdm.common.entity.enums.NodeTypeEnum; +import com.sdm.common.entity.enums.ValueTypeEnum; import com.sdm.common.entity.req.data.CreateDirReq; import com.sdm.common.entity.req.data.DelDirReq; import com.sdm.common.entity.req.data.RenameDirReq; @@ -1625,6 +1626,12 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { } if (CollectionUtils.isNotEmpty(projectNodePerformanceExtraList)) { projectNodePerformanceExtraList.forEach(projectNode -> projectNode.setCreateTime(createTime)); + for (TaskExtraNode performanceExtraNode : projectNodePerformanceExtraList) { + performanceExtraNode.setCreateTime(createTime); + if (StringUtils.isBlank(performanceExtraNode.getValueType())) { + performanceExtraNode.setValueType(ValueTypeEnum.DEFAULT.getValue()); + } + } if (mapper.batchAddSimulationPerformanceExtra(projectNodePerformanceExtraList) <= 0) { response = SdmResponse.failed("新增任务指标附加属性失败"); return response; @@ -1812,7 +1819,10 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { } } if (CollectionUtils.isNotEmpty(projectNodePerformanceExtraList)) { - projectNodePerformanceExtraList.forEach(projectNode -> projectNode.setCreateTime(createTime)); + for (TaskExtraNode performanceExtraNode : projectNodePerformanceExtraList) { + performanceExtraNode.setCreateTime(createTime); + performanceExtraNode.setValueType(ValueTypeEnum.DEFAULT.getValue()); + } if (mapper.batchAddSimulationPerformanceExtra(projectNodePerformanceExtraList) <= 0) { response = SdmResponse.failed("新增任务指标附加属性失败"); return response; diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java index e5146f22..3d4ffe54 100644 --- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java @@ -559,7 +559,7 @@ public class TaskServiceImpl implements ITaskService { // 由于我分发的、我执行的、我关注的、所有任务，都需要展示仿真负责人，故将负责人抽成方法调用 List pUserIdList = eachMemberList.stream().filter(member -> MemberTypeEnum.PRINCIPAL.getCode().equals(member.getType()) && StringUtils.equals(task.getUuid(), member.getTaskId())).map(SpdmTaskMemberVo::getUserId).distinct().toList(); if (CollectionUtils.isNotEmpty(pUserIdList)) { - SdmResponse> cidUserResp= sysUserFeignClient.listUserByIds(UserQueryReq.builder().userIds(pUserIdList).build()); + SdmResponse> cidUserResp = sysUserFeignClient.listUserByIds(UserQueryReq.builder().userIds(pUserIdList).build()); task.setPMemberList(cidUserResp.getData()); } } @@ -568,7 +568,7 @@ public class TaskServiceImpl implements ITaskService { // 由于我分发的、我关注的、所有任务，都需要展示仿真执行人，故将执行人抽成方法调用 List eUserIdList = eachMemberList.stream().filter(member -> MemberTypeEnum.EXECUTOR.getCode().equals(member.getType()) && StringUtils.equals(task.getUuid(), member.getTaskId())).map(SpdmTaskMemberVo::getUserId).distinct().toList(); if (CollectionUtils.isNotEmpty(eUserIdList)) { - SdmResponse> cidUserResp= sysUserFeignClient.listUserByIds(UserQueryReq.builder().userIds(eUserIdList).build()); + SdmResponse> cidUserResp = sysUserFeignClient.listUserByIds(UserQueryReq.builder().userIds(eUserIdList).build()); task.setEMemberList(cidUserResp.getData()); } } @@ -726,6 +726,30 @@ public class TaskServiceImpl implements ITaskService { return SdmResponse.failed("编辑仿真执行人失败"); } } + // 新增拓展属性 + List extraList = req.getExtras(); + if (CollectionUtils.isEmpty(extraList)) { + continue; + } + String currentTaskId = req.getTaskId(); + List taskExtraList = simulationTaskExtraService.lambdaQuery().eq(SimulationTaskExtra::getTaskId, currentTaskId).list(); + if (CollectionUtils.isEmpty(taskExtraList)) { + simulationTaskExtraService.saveBatch(extraList); + continue; + } + List propertyNameList = taskExtraList.stream().map(SimulationTaskExtra::getPropertyName).toList(); + List saveTaskExtraList = extraList.stream().filter(extra -> !propertyNameList.contains(extra.getPropertyName())).toList(); + if (CollectionUtils.isNotEmpty(saveTaskExtraList)) { + simulationTaskExtraService.saveBatch(extraList); + } + List updateTaskExtraList = extraList.stream().filter(extra -> propertyNameList.contains(extra.getPropertyName())).toList(); + if (CollectionUtils.isNotEmpty(updateTaskExtraList)) { + for (SimulationTaskExtra simulationTaskExtra : updateTaskExtraList) { + simulationTaskExtraService.lambdaUpdate().set(SimulationTaskExtra::getPropertyValue,simulationTaskExtra.getPropertyValue()) + .eq(SimulationTaskExtra::getId, simulationTaskExtra.getId()) + .update(); + } + } } } return SdmResponse.success(); @@ -764,7 +788,7 @@ public class TaskServiceImpl implements ITaskService { } List taskIdList = taskVoList.stream().map(SpdmAnalysisTaskVo::getUuid).toList(); - List performanceNodePoList = projectMapper.queryPerformanceNodeByNodeIdList(taskIdList,req.getBeginTime(),req.getEndTime(),req.getName()); + List performanceNodePoList = projectMapper.queryPerformanceNodeByNodeIdList(taskIdList, req.getBeginTime(), req.getEndTime(), req.getName()); if (CollectionUtils.isEmpty(performanceNodePoList)) { log.error("指标查询中，未查询到指标1"); return SdmResponse.success(new ArrayList<>()); @@ -893,7 +917,7 @@ public class TaskServiceImpl implements ITaskService { return SdmResponse.success(new ArrayList<>()); } List taskIdList = taskVoList.stream().map(SpdmAnalysisTaskVo::getUuid).toList(); - List runPoList = projectMapper.queryRunListByNodeIdList(taskIdList,req.getBeginTime(),req.getEndTime(),req.getName()); + List runPoList = projectMapper.queryRunListByNodeIdList(taskIdList, req.getBeginTime(), req.getEndTime(), req.getName()); if (CollectionUtils.isEmpty(runPoList)) { log.error("算例查询中，未查询到算例1"); return SdmResponse.success(new ArrayList<>()); @@ -994,14 +1018,14 @@ public class TaskServiceImpl implements ITaskService { @Override public SdmResponse getAllRunResultByTaskId(String taskId) { - GetAllRunResultByTaskIdResp result= new GetAllRunResultByTaskIdResp(); + GetAllRunResultByTaskIdResp result = new GetAllRunResultByTaskIdResp(); // taskId不为null，runid为null，查询所有工况设定的标准指标 List simulationTaskPerformances = simulationPerformanceService .lambdaQuery() .eq(SimulationPerformance::getTaskId, taskId) .isNull(SimulationPerformance::getRunId) .list(); - if(CollectionUtils.isEmpty(simulationTaskPerformances)) { + if (CollectionUtils.isEmpty(simulationTaskPerformances)) { return SdmResponse.success(); } @@ -1012,7 +1036,6 @@ public class TaskServiceImpl implements ITaskService { }); - // // taskId不为null，runid不为null，获取算列计算结果 List simulationRunList = simulationRunService.lambdaQuery().eq(SimulationRun::getTaskId, taskId).list(); @@ -1026,7 +1049,7 @@ public class TaskServiceImpl implements ITaskService { List runResultRespList = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(simulationRunList)) { + if (CollectionUtils.isNotEmpty(simulationRunList)) { for (SimulationRun simulationRun : simulationRunList) { RunResultResp runResultResp = new RunResultResp(); runResultResp.setSimulationRun(simulationRun); @@ -1058,7 +1081,7 @@ public class TaskServiceImpl implements ITaskService { public SdmResponse> listUserWorkloadsWithinTimeFrame(UserWorkloadReq req) { List userWorkloadRespList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(req.getUserIds())) { - SdmResponse> cidUserResp= sysUserFeignClient.listUserByIds(UserQueryReq.builder().userIds(req.getUserIds().stream().map(Long::valueOf).toList()).build()); + SdmResponse> cidUserResp = sysUserFeignClient.listUserByIds(UserQueryReq.builder().userIds(req.getUserIds().stream().map(Long::valueOf).toList()).build()); List userList = cidUserResp.getData(); for (CIDUserResp userResp : userList) { UserWorkloadResp workloadResp = new UserWorkloadResp(); @@ -1111,15 +1134,15 @@ public class TaskServiceImpl implements ITaskService { } req.setIdMap(currentIdMapList); if (ObjectUtils.isNotEmpty(params)) { - BeanUtils.copyProperties(params,req); + BeanUtils.copyProperties(params, req); } req.setCurrent(1); req.setSize(10000); List exportExcelFormats = taskExportExcelFormat.getExcelHeaders(); SdmResponse taskRespond = list(req); SdmResponse response = new SdmResponse(); - if(taskRespond.isSuccess()) { - JSONObject dataObj = (JSONObject) taskRespond.getData(); + if (taskRespond.isSuccess()) { + JSONObject dataObj = (JSONObject) taskRespond.getData(); List taskVoList = (List) dataObj.get("data"); List exportNewTaskVoList = new ArrayList<>(); List pMemberList; @@ -1136,14 +1159,14 @@ public class TaskServiceImpl implements ITaskService { eMemberName = eMemberList.stream().map(CIDUserResp::getNickname).collect(Collectors.joining(",")); } SpdmExportNewTaskVo spdmExportNewTaskVo = new SpdmExportNewTaskVo(); - BeanUtils.copyProperties(spdmNewTaskVo,spdmExportNewTaskVo); + BeanUtils.copyProperties(spdmNewTaskVo, spdmExportNewTaskVo); spdmExportNewTaskVo.setPMemberList(pMemberName); spdmExportNewTaskVo.setEMemberList(eMemberName); exportNewTaskVoList.add(spdmExportNewTaskVo); } - ExcelUtil.exportExcelNoMerge(JSONArray.from(exportNewTaskVoList),exportExcelFormats,httpServletResponse); + ExcelUtil.exportExcelNoMerge(JSONArray.from(exportNewTaskVoList), exportExcelFormats, httpServletResponse); } else { - response = SdmResponse.failed(taskRespond.getMessage()); + response = SdmResponse.failed(taskRespond.getMessage()); } return response; } @@ -1295,21 +1318,21 @@ public class TaskServiceImpl implements ITaskService { @Override public SdmResponse getTaskDetail(GetTaskDetailReq req) { - log.info("getTaskDetail参数为：{}",req); + log.info("getTaskDetail参数为：{}", req); SpdmTaskVo taskVo = mapper.getTask(req.getRelatedResourceUuid()); if (ObjectUtils.isEmpty(taskVo)) { - log.error("根据id：{}，未查询到任务",req.getRelatedResourceUuid()); + log.error("根据id：{}，未查询到任务", req.getRelatedResourceUuid()); return SdmResponse.failed("未查询到任务"); } SpdmTaskDetailVo spdmTaskDetailVo = new SpdmTaskDetailVo(); - BeanUtils.copyProperties(taskVo,spdmTaskDetailVo); + BeanUtils.copyProperties(taskVo, spdmTaskDetailVo); spdmTaskDetailVo.setId(taskVo.getId()); List memberList = mapper.getMemberList(Collections.singletonList(taskVo.getUuid()), null); if (CollectionUtils.isNotEmpty(memberList)) { List userIdList = memberList.stream().map(SpdmTaskMemberVo::getUserId).toList(); Map> userMap = Map.of(); if (CollectionUtils.isNotEmpty(userIdList)) { - SdmResponse> cidUserResp= sysUserFeignClient.listUserByIds(UserQueryReq.builder().userIds(userIdList).build()); + SdmResponse> cidUserResp = sysUserFeignClient.listUserByIds(UserQueryReq.builder().userIds(userIdList).build()); List userList = cidUserResp.getData(); if (CollectionUtils.isNotEmpty(userList)) { userMap = userList.stream().collect(Collectors.groupingBy(CIDUserResp::getUserId)); @@ -1343,7 +1366,7 @@ public class TaskServiceImpl implements ITaskService { return SdmResponse.success(spdmTaskDetailVo); } - private SdmResponse createDir(String uuid, String uuidOwnType,String parentUuid, String dirName) { + private SdmResponse createDir(String uuid, String uuidOwnType, String parentUuid, String dirName) { CreateDirReq createDirReq = new CreateDirReq(); createDirReq.setUuId(uuid); createDirReq.setUuIdOwnType(uuidOwnType); @@ -1360,7 +1383,7 @@ public class TaskServiceImpl implements ITaskService { @Override public BosimSaveProjectTaskRsp syncCidTask(SyncCidTaskReq req) { Long userId = ThreadLocalContext.getUserId(); - log.info("syncCidTask中，userId为：{}",userId); + log.info("syncCidTask中，userId为：{}", userId); userId = ObjectUtils.isNotEmpty(userId) ? userId : 1999363561237610497L; BosimSaveProjectTaskRsp resp = new BosimSaveProjectTaskRsp(); String projectId = req.getProjectId(); @@ -1373,7 +1396,7 @@ public class TaskServiceImpl implements ITaskService { } String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); // 查询是否已同步过项目 - SpdmNodeVo spdmNodeVo = nodeMapper.getNodeByProjectIdAndName(projectId,projectName); + SpdmNodeVo spdmNodeVo = nodeMapper.getNodeByProjectIdAndName(projectId, projectName); if (ObjectUtils.isEmpty(spdmNodeVo)) { SpdmProjectNodeEditReq spdmProjectNodeEditReq = new SpdmProjectNodeEditReq(); spdmProjectNodeEditReq.setNodeName(req.getProjectName()); @@ -1384,7 +1407,7 @@ public class TaskServiceImpl implements ITaskService { spdmProjectNodeEditReq.setPid(""); spdmProjectNodeEditReq.setTenantId(ThreadLocalContext.getTenantId()); if (nodeMapper.addNodeBatch(Collections.singletonList(spdmProjectNodeEditReq)) <= 0) { - log.error("同步CID项目：{}失败",req.getProjectId() + " " + req.getProjectName()); + log.error("同步CID项目：{}失败", req.getProjectId() + " " + req.getProjectName()); resp.setCode(String.valueOf(ResultCode.FAILED.getCode())); resp.setMessage(ResultCode.FAILED.getMessage()); return resp; @@ -1393,7 +1416,7 @@ public class TaskServiceImpl implements ITaskService { // 创建项目节点的文件夹 SdmResponse response = createDir(spdmProjectNodeEditReq.getUuid(), spdmProjectNodeEditReq.getNodeType(), null, spdmProjectNodeEditReq.getNodeName()); if (ObjectUtils.isEmpty(response) || response.getCode() != ResultCode.SUCCESS.getCode()) { - log.error("同步CID项目：{}时，创建文件夹失败，原因为：{}",req.getProjectId() + " " + req.getProjectName(),response.getMessage()); + log.error("同步CID项目：{}时，创建文件夹失败，原因为：{}", req.getProjectId() + " " + req.getProjectName(), response.getMessage()); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); resp.setCode(String.valueOf(ResultCode.FAILED.getCode())); resp.setMessage(ResultCode.FAILED.getMessage()); @@ -1406,11 +1429,11 @@ public class TaskServiceImpl implements ITaskService { Map userPermissions = new HashMap<>(); userPermissions.put(userId, FilePermissionEnum.ALL.getValue()); updatePermissionReq.setUserPermissions(userPermissions); - log.info("同步CID项目时，更新用户权限的参数为：{}",updatePermissionReq); + log.info("同步CID项目时，更新用户权限的参数为：{}", updatePermissionReq); SdmResponse updatePermissionResponse = dataClientFeignClient.updatePermission(updatePermissionReq); - log.info("同步CID项目时，更新用户权限的返回值为：{}",updatePermissionResponse); - }catch (Exception ex) { - log.error("同步CID项目：{}时，创建文件夹异常，原因为：{}",req.getProjectId() + " " + req.getProjectName(),ex.getMessage()); + log.info("同步CID项目时，更新用户权限的返回值为：{}", updatePermissionResponse); + } catch (Exception ex) { + log.error("同步CID项目：{}时，创建文件夹异常，原因为：{}", req.getProjectId() + " " + req.getProjectName(), ex.getMessage()); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); resp.setCode(String.valueOf(ResultCode.FAILED.getCode())); resp.setMessage(ResultCode.FAILED.getMessage()); @@ -1432,9 +1455,9 @@ public class TaskServiceImpl implements ITaskService { List projectIdList = taskVoList.stream().map(SpdmTaskVo::getTag1).toList(); if (projectIdList.contains(projectId)) { String existTaskName = taskVoList.stream().map(SpdmTaskVo::getTaskName).collect(Collectors.joining(",")); - log.error("本次同步任务失败,以下任务:{}已存在",existTaskName); + log.error("本次同步任务失败,以下任务:{}已存在", existTaskName); resp.setCode(String.valueOf(ResultCode.FAILED.getCode())); - resp.setMessage("本次同步任务失败,以下任务:"+existTaskName+"已存在"); + resp.setMessage("本次同步任务失败,以下任务:" + existTaskName + "已存在"); return resp; } } @@ -1462,7 +1485,7 @@ public class TaskServiceImpl implements ITaskService { for (CidTaskNode taskNode : taskNodeList) { response = createDir(taskNode.getUuid(), NodeTypeEnum.TASK.getValue(), req.getProjectId(), taskNode.getTaskName()); if (ObjectUtils.isEmpty(response) || response.getCode() != ResultCode.SUCCESS.getCode()) { - log.error("同步CID任务时，创建任务：{}的文件夹失败，原因为：{}",taskNode.getUuid() + " " + taskNode.getTaskName(),response.getMessage()); + log.error("同步CID任务时，创建任务：{}的文件夹失败，原因为：{}", taskNode.getUuid() + " " + taskNode.getTaskName(), response.getMessage()); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); resp.setCode(String.valueOf(ResultCode.FAILED.getCode())); resp.setMessage(ResultCode.FAILED.getMessage()); @@ -1477,13 +1500,13 @@ public class TaskServiceImpl implements ITaskService { Map userPermissions = new HashMap<>(); userPermissions.put(userId, FilePermissionEnum.ALL.getValue()); updatePermissionReq.setUserPermissions(userPermissions); - log.info("同步CID任务时，更新用户权限的参数为：{}",updatePermissionReq); + log.info("同步CID任务时，更新用户权限的参数为：{}", updatePermissionReq); SdmResponse updatePermissionResponse = dataClientFeignClient.updatePermission(updatePermissionReq); - log.info("同步CID任务时，更新用户权限的返回值为：{}",updatePermissionResponse); + log.info("同步CID任务时，更新用户权限的返回值为：{}", updatePermissionResponse); } - }catch (Exception ex) { - log.error("同步CID任务时，创建文件夹失败，原因为：{}",ex.getMessage()); + } catch (Exception ex) { + log.error("同步CID任务时，创建文件夹失败，原因为：{}", ex.getMessage()); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); resp.setCode(String.valueOf(ResultCode.FAILED.getCode())); resp.setMessage(ResultCode.FAILED.getMessage()); @@ -1500,7 +1523,7 @@ public class TaskServiceImpl implements ITaskService { Set allExeStatus = new HashSet<>(); List taskList = mapper.getTaskListByTag(req); if (CollectionUtils.isEmpty(taskList)) { - log.error("根据参数：{}，未查询到任务",req); + log.error("根据参数：{}，未查询到任务", req); JSONObject resultResponse = new JSONObject(); resultResponse.put("allExeStatus", allExeStatus); resultResponse.put("result", new ArrayList<>()); @@ -1519,7 +1542,7 @@ public class TaskServiceImpl implements ITaskService { } } if (CollectionUtils.isEmpty(nodeIdList)) { - log.error("根据任务：{}，未查询到{}标签中的节点id",taskList,resultTagType); + log.error("根据任务：{}，未查询到{}标签中的节点id", taskList, resultTagType); JSONObject resultResponse = new JSONObject(); resultResponse.put("allExeStatus", allExeStatus); resultResponse.put("result", new ArrayList<>()); @@ -1528,7 +1551,7 @@ public class TaskServiceImpl implements ITaskService { nodeIdList = nodeIdList.stream().distinct().toList(); List nodeList = nodeMapper.getNodeListByIds(nodeIdList); if (CollectionUtils.isEmpty(nodeList)) { - log.error("根据节点id：{}，未查询节点",nodeIdList); + log.error("根据节点id：{}，未查询节点", nodeIdList); JSONObject resultResponse = new JSONObject(); resultResponse.put("allExeStatus", allExeStatus); resultResponse.put("result", new ArrayList<>()); @@ -1540,12 +1563,12 @@ public class TaskServiceImpl implements ITaskService { String[] resultTagIdArr; for (SpdmTaskVo taskVo : taskList) { try { - resultTagId = getTagProperty(taskVo,resultTagType); + resultTagId = getTagProperty(taskVo, resultTagType); } catch (Exception e) { throw new RuntimeException(e); } if (StringUtils.isBlank(resultTagId)) { - log.error("id：{}任务的：{}标签不存在",taskVo.getId(),resultTagType); + log.error("id：{}任务的：{}标签不存在", taskVo.getId(), resultTagType); continue; } resultTagIdArr = resultTagId.split(","); @@ -1587,10 +1610,10 @@ public class TaskServiceImpl implements ITaskService { // 所有指标执行状态 Set allExeStatus = new HashSet<>(); TaskCompleteStatisticsReq taskCompleteStatisticsReq = new TaskCompleteStatisticsReq(); - BeanUtils.copyProperties(req,taskCompleteStatisticsReq); + BeanUtils.copyProperties(req, taskCompleteStatisticsReq); List taskList = mapper.getTaskListByTag(taskCompleteStatisticsReq); if (CollectionUtils.isEmpty(taskList)) { - log.error("根据参数：{}，未查询到任务",req); + log.error("根据参数：{}，未查询到任务", req); JSONObject resultResponse = new JSONObject(); resultResponse.put("allExeStatus", allExeStatus); resultResponse.put("result", new ArrayList<>()); @@ -1600,7 +1623,7 @@ public class TaskServiceImpl implements ITaskService { List taskIdList = taskList.stream().map(SpdmTaskVo::getUuid).distinct().toList(); List performanceList = nodeMapper.getPerformanceListByNodeIdList(taskIdList); if (CollectionUtils.isEmpty(performanceList)) { - log.error("根据任务id：{}，未查询到指标",taskIdList); + log.error("根据任务id：{}，未查询到指标", taskIdList); JSONObject resultResponse = new JSONObject(); resultResponse.put("allExeStatus", allExeStatus); resultResponse.put("result", new ArrayList<>()); @@ -1631,7 +1654,7 @@ public class TaskServiceImpl implements ITaskService { } } if (CollectionUtils.isEmpty(nodeIdList)) { - log.error("根据任务：{}，未查询到{}标签中的节点id",taskList,resultTagType); + log.error("根据任务：{}，未查询到{}标签中的节点id", taskList, resultTagType); JSONObject resultResponse = new JSONObject(); resultResponse.put("allExeStatus", allExeStatus); resultResponse.put("result", new ArrayList<>()); @@ -1640,7 +1663,7 @@ public class TaskServiceImpl implements ITaskService { nodeIdList = nodeIdList.stream().distinct().toList(); List nodeList = nodeMapper.getNodeListByIds(nodeIdList); if (CollectionUtils.isEmpty(nodeList)) { - log.error("根据节点id：{}，未查询节点",nodeIdList); + log.error("根据节点id：{}，未查询节点", nodeIdList); JSONObject resultResponse = new JSONObject(); resultResponse.put("allExeStatus", allExeStatus); resultResponse.put("result", new ArrayList<>()); @@ -1653,12 +1676,12 @@ public class TaskServiceImpl implements ITaskService { for (PerformanceNodePo performanceNodePo : performanceList) { eachTaskVo = taskMap.get(performanceNodePo.getTaskId()); try { - resultTagId = getTagProperty(eachTaskVo,resultTagType); + resultTagId = getTagProperty(eachTaskVo, resultTagType); } catch (Exception e) { throw new RuntimeException(e); } if (StringUtils.isBlank(resultTagId)) { - log.error("id：{}任务的：{}标签不存在",eachTaskVo.getId(),resultTagType); + log.error("id：{}任务的：{}标签不存在", eachTaskVo.getId(), resultTagType); continue; } resultTagIdArr = resultTagId.split(","); @@ -1710,7 +1733,7 @@ public class TaskServiceImpl implements ITaskService { log.info("项目成员为空"); return SdmResponse.success(); } - List userList = (List)((JSONObject) sdmResponse.getData()).get("data"); + List userList = (List) ((JSONObject) sdmResponse.getData()).get("data"); if (CollectionUtils.isEmpty(userList)) { log.info("项目成员为空"); return SdmResponse.success(); @@ -1764,7 +1787,7 @@ public class TaskServiceImpl implements ITaskService { log.info("项目成员为空"); return SdmResponse.success(); } - List userList = (List)((JSONObject) sdmResponse.getData()).get("data"); + List userList = (List) ((JSONObject) sdmResponse.getData()).get("data"); if (CollectionUtils.isEmpty(userList)) { log.info("项目成员为空"); return SdmResponse.success(); @@ -1808,7 +1831,7 @@ public class TaskServiceImpl implements ITaskService { if (!taskRespond.isSuccess()) { return taskRespond; } - JSONObject dataObj = (JSONObject) taskRespond.getData(); + JSONObject dataObj = (JSONObject) taskRespond.getData(); List taskVoList = (List) dataObj.get("data"); JSONObject jsonObject = new JSONObject(); if (CollectionUtils.isEmpty(taskVoList)) { @@ -1823,7 +1846,7 @@ public class TaskServiceImpl implements ITaskService { List spdmPUserVoList = new ArrayList<>(); List spdmEUserVoList = new ArrayList<>(); SpdmTaskDetailVo spdmTaskDetailVo = new SpdmTaskDetailVo(); - BeanUtils.copyProperties(taskVo,spdmTaskDetailVo); + BeanUtils.copyProperties(taskVo, spdmTaskDetailVo); spdmTaskDetailVo.setId(taskVo.getId()); List userIdList = memberList.stream().filter(member -> taskVo.getUuid().equals(member.getTaskId())).map(SpdmTaskMemberVo::getUserId).toList(); if (CollectionUtils.isEmpty(userIdList)) { @@ -1860,10 +1883,10 @@ public class TaskServiceImpl implements ITaskService { } spdmTaskDetailVoList.add(spdmTaskDetailVo); } - }else { + } else { for (SpdmNewTaskVo taskVo : taskVoList) { SpdmTaskDetailVo spdmTaskDetailVo = new SpdmTaskDetailVo(); - BeanUtils.copyProperties(taskVo,spdmTaskDetailVo); + BeanUtils.copyProperties(taskVo, spdmTaskDetailVo); spdmTaskDetailVo.setId(taskVo.getId()); spdmTaskDetailVoList.add(spdmTaskDetailVo); } @@ -1890,7 +1913,7 @@ public class TaskServiceImpl implements ITaskService { } req.setIdMap(currentIdMapList); if (ObjectUtils.isNotEmpty(params)) { - BeanUtils.copyProperties(params,req); + BeanUtils.copyProperties(params, req); } req.setConvertTag(false); req.setType(2); @@ -1902,8 +1925,8 @@ public class TaskServiceImpl implements ITaskService { SdmResponse response = new SdmResponse(); List tagMap = params.getTagMap(); List allNodeIdList = new ArrayList<>(); - if(taskRespond.isSuccess()) { - JSONObject dataObj = (JSONObject) taskRespond.getData(); + if (taskRespond.isSuccess()) { + JSONObject dataObj = (JSONObject) taskRespond.getData(); List taskVoList = (List) dataObj.get("data"); if (CollectionUtils.isEmpty(taskVoList)) { log.error("导出任务分析项树时，任务不能为空"); @@ -1914,7 +1937,7 @@ public class TaskServiceImpl implements ITaskService { taskVoList = taskVoList.stream().filter(task -> chooseTaskIdList.contains(task.getUuid())).toList(); } if (CollectionUtils.isEmpty(taskVoList)) { - log.error("导出任务分析项树时，根据任务id：{}过滤后，任务集合为空",chooseTaskIdList); + log.error("导出任务分析项树时，根据任务id：{}过滤后，任务集合为空", chooseTaskIdList); return SdmResponse.failed("任务不能为空"); } List fixedHeaderList = new ArrayList<>(); @@ -1970,7 +1993,7 @@ public class TaskServiceImpl implements ITaskService { fixedHeaderList.add(taskCodeExportExcelFormat); fixedHeaderList.add(performanceNameExportExcelFormat); fixedHeaderList.add(performanceCodeExportExcelFormat); - }else if (nodeNameOptional.isPresent()) { + } else if (nodeNameOptional.isPresent()) { // 机台 ExportExcelFormat machineNameExportExcelFormat = new ExportExcelFormat(); machineNameExportExcelFormat.setKey(MACHINE_NAME_KEY); @@ -2001,7 +2024,7 @@ public class TaskServiceImpl implements ITaskService { fixedHeaderList.add(disciplineNameExportExcelFormat); fixedHeaderList.add(taskNameExportExcelFormat); fixedHeaderList.add(performanceNameExportExcelFormat); - }else if (nodeCodeOptional.isPresent()) { + } else if (nodeCodeOptional.isPresent()) { // 机台 ExportExcelFormat machineCodeExportExcelFormat = new ExportExcelFormat(); machineCodeExportExcelFormat.setKey(MACHINE_CODE_KEY); @@ -2061,7 +2084,7 @@ public class TaskServiceImpl implements ITaskService { eMemberName = eMemberList.stream().map(CIDUserResp::getNickname).collect(Collectors.joining(",")); } SpdmExportNewTaskVo spdmExportNewTaskVo = new SpdmExportNewTaskVo(); - BeanUtils.copyProperties(spdmNewTaskVo,spdmExportNewTaskVo); + BeanUtils.copyProperties(spdmNewTaskVo, spdmExportNewTaskVo); spdmExportNewTaskVo.setPMemberList(pMemberName); spdmExportNewTaskVo.setEMemberList(eMemberName); // 查询任务相应的前置节点和指标 @@ -2198,7 +2221,7 @@ public class TaskServiceImpl implements ITaskService { if (CollectionUtils.isNotEmpty(performanceNodePoList)) { for (PerformanceNodePo performanceNodePo : performanceNodePoList) { SpdmExportNewTaskVo exportNewTaskVo = new SpdmExportNewTaskVo(); - BeanUtils.copyProperties(performanceNodePo,exportNewTaskVo); + BeanUtils.copyProperties(performanceNodePo, exportNewTaskVo); exportNewTaskVo.setMachineName(spdmExportNewTaskVo.getMachineName()); exportNewTaskVo.setMachineCode(spdmExportNewTaskVo.getMachineCode()); exportNewTaskVo.setWorkspaceName(spdmExportNewTaskVo.getWorkspaceName()); @@ -2218,9 +2241,9 @@ public class TaskServiceImpl implements ITaskService { } } } - ExcelUtil.exportExcelNoMerge(JSONArray.from(allExportNewTaskVoList),exportExcelFormats,httpServletResponse); + ExcelUtil.exportExcelNoMerge(JSONArray.from(allExportNewTaskVoList), exportExcelFormats, httpServletResponse); } else { - response = SdmResponse.failed(taskRespond.getMessage()); + response = SdmResponse.failed(taskRespond.getMessage()); } return response; } diff --git a/project/src/main/resources/mapper/SimulationTaskMapper.xml b/project/src/main/resources/mapper/SimulationTaskMapper.xml index ff20a322..a300f328 100644 --- a/project/src/main/resources/mapper/SimulationTaskMapper.xml +++ b/project/src/main/resources/mapper/SimulationTaskMapper.xml @@ -70,6 +70,14 @@ ) + + and approval_status in ( + + #{approvalStatus} + + ) + +