diff --git a/approve/src/main/resources/logback.xml b/approve/src/main/resources/logback.xml index 11be6dbc..6c6a39c9 100644 --- a/approve/src/main/resources/logback.xml +++ b/approve/src/main/resources/logback.xml @@ -38,15 +38,51 @@ + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/capability/src/main/resources/logback.xml b/capability/src/main/resources/logback.xml index d0c7b124..a42fa36a 100644 --- a/capability/src/main/resources/logback.xml +++ b/capability/src/main/resources/logback.xml @@ -57,6 +57,12 @@ + + + + + + @@ -69,9 +75,39 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/src/main/java/com/sdm/data/service/impl/ModelServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/ModelServiceImpl.java index 3fef3631..9a4f8849 100644 --- a/data/src/main/java/com/sdm/data/service/impl/ModelServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/ModelServiceImpl.java @@ -248,7 +248,7 @@ public class ModelServiceImpl implements IModelService { minioInputStream = dataFileService.getMinioInputStream(trainingDataHandleFileId); if (minioInputStream == null) { - return SdmResponse.failed("无法从MinIO获取文件流"); + return SdmResponse.success("请导入数据处理"); } @@ -261,7 +261,9 @@ public class ModelServiceImpl implements IModelService { return SdmResponse.failed("处理JSON文件失败: " + e.getMessage()); } finally { try { - minioInputStream.close(); + if (minioInputStream != null) { + minioInputStream.close(); + } } catch (IOException e) { log.error("关闭输入流失败", e); } @@ -1344,7 +1346,7 @@ public class ModelServiceImpl implements IModelService { } } if (model.getPredStatus().equals("待开始") || model.getPredStatus().equals("预测中")) { - return SdmResponse.failed("模型预测未完成"); + return SdmResponse.success("模型预测未完成"); } String inputPredLabelValue = model.getInputPredLabelValue(); if (inputPredLabelValue != null) { diff --git a/data/src/main/resources/logback.xml b/data/src/main/resources/logback.xml index 3c69184d..25695cf5 100644 --- a/data/src/main/resources/logback.xml +++ b/data/src/main/resources/logback.xml @@ -76,6 +76,15 @@ + + + + + + + + + @@ -88,19 +97,39 @@ - - - - - - + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pbs/src/main/resources/logback.xml b/pbs/src/main/resources/logback.xml index a2f6937a..b6d247f3 100644 --- a/pbs/src/main/resources/logback.xml +++ b/pbs/src/main/resources/logback.xml @@ -36,15 +36,51 @@ + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/performance/src/main/resources/logback.xml b/performance/src/main/resources/logback.xml index c16756bf..2b507257 100644 --- a/performance/src/main/resources/logback.xml +++ b/performance/src/main/resources/logback.xml @@ -36,6 +36,12 @@ + + + + + + @@ -47,4 +53,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/src/main/java/com/sdm/project/model/req/GetUserGroupTaskCompleteStatisticsReq.java b/project/src/main/java/com/sdm/project/model/req/GetUserGroupTaskCompleteStatisticsReq.java index ee3fc9bd..0a1eea62 100644 --- a/project/src/main/java/com/sdm/project/model/req/GetUserGroupTaskCompleteStatisticsReq.java +++ b/project/src/main/java/com/sdm/project/model/req/GetUserGroupTaskCompleteStatisticsReq.java @@ -4,6 +4,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.Data; +import java.util.List; +import java.util.Set; + /** * 用户组任务完成情况统计请求参数 */ @@ -16,6 +19,9 @@ public class GetUserGroupTaskCompleteStatisticsReq { @Schema(description = "用户ID") private Long userId; + + @Schema(description = "用户") + private Set userIds; @Schema(description = "标签1") private String tag1; diff --git a/project/src/main/java/com/sdm/project/model/vo/UserGroupDifficultyVo.java b/project/src/main/java/com/sdm/project/model/vo/UserGroupDifficultyVo.java index 72ff5f49..5465868f 100644 --- a/project/src/main/java/com/sdm/project/model/vo/UserGroupDifficultyVo.java +++ b/project/src/main/java/com/sdm/project/model/vo/UserGroupDifficultyVo.java @@ -4,7 +4,7 @@ import lombok.Data; @Data public class UserGroupDifficultyVo { - private float difficulty; + private float difficult; private Long userId; private String nickname; private Long groupId; diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java index d116ab64..5ef430d2 100644 --- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java @@ -709,20 +709,10 @@ public class NodeServiceImpl extends ServiceImpl sysUserGroupDetailRespSdmResponse = sysUserFeignClient.queryGroupDetail(req); - if (!sysUserGroupDetailRespSdmResponse.isSuccess() - || ObjectUtils.isEmpty(sysUserGroupDetailRespSdmResponse.getData()) - || ObjectUtils.isEmpty(sysUserGroupDetailRespSdmResponse.getData().getUsers()) - || ObjectUtils.isEmpty(sysUserGroupDetailRespSdmResponse.getData().getUsers().getData())) { + Map userId2Nickname = getUserIdToNicknameMap(userGroupId); + if (MapUtils.isEmpty(userId2Nickname)) { return SdmResponse.success(); } - Map userId2Nickname = sysUserGroupDetailRespSdmResponse.getData().getUsers().getData().stream().collect(Collectors.toMap(CIDUserResp::getUserId, CIDUserResp::getNickname)); - Set userIds = new HashSet<>(); if (ObjectUtils.isEmpty(userId)) { @@ -731,7 +721,6 @@ public class NodeServiceImpl extends ServiceImpl userGroupProjectStatistics = this.baseMapper.getUserGroupProjectStatistics(userIds); if (CollectionUtils.isEmpty(userGroupProjectStatistics)) { return SdmResponse.success(new ArrayList<>()); @@ -758,8 +747,45 @@ public class NodeServiceImpl extends ServiceImpl getUserIdToNicknameMap(Long userGroupId) { + QueryGroupDetailReq req = new QueryGroupDetailReq(); + req.setCurrent(1); + req.setSize(1000); + req.setId(userGroupId); + req.setTenantId(ThreadLocalContext.getTenantId()); + SdmResponse sysUserGroupDetailRespSdmResponse = sysUserFeignClient.queryGroupDetail(req); + if (!sysUserGroupDetailRespSdmResponse.isSuccess() + || ObjectUtils.isEmpty(sysUserGroupDetailRespSdmResponse.getData()) + || ObjectUtils.isEmpty(sysUserGroupDetailRespSdmResponse.getData().getUsers()) + || ObjectUtils.isEmpty(sysUserGroupDetailRespSdmResponse.getData().getUsers().getData())) { + return Collections.emptyMap(); + } + return sysUserGroupDetailRespSdmResponse.getData().getUsers().getData().stream().collect(Collectors.toMap(CIDUserResp::getUserId, CIDUserResp::getNickname)); + } + @Override public SdmResponse getUserGroupTaskCompleteStatistics(GetUserGroupTaskCompleteStatisticsReq req) { + Map userId2Nickname = getUserIdToNicknameMap(req.getUserGroupId()); + if (MapUtils.isEmpty(userId2Nickname)) { + return SdmResponse.success(); + } + + // 设置用户ID列表 + Set userIds = new HashSet<>(); + if (ObjectUtils.isEmpty(req.getUserId())) { + userIds = userId2Nickname.keySet(); + } else { + userIds.add(req.getUserId()); + } + + req.setUserIds(userIds); + List userGroupTaskCompleteStatistics = this.baseMapper.getUserGroupTaskCompleteStatistics(req); // 按用户分组统计任务状态 @@ -776,7 +802,7 @@ public class NodeServiceImpl extends ServiceImpl statusCount = userStat.getStatusCount(); if (statusCount == null) { @@ -800,6 +826,20 @@ public class NodeServiceImpl extends ServiceImpl userId2Nickname = getUserIdToNicknameMap(req.getUserGroupId()); + if (MapUtils.isEmpty(userId2Nickname)) { + return SdmResponse.success(); + } + + // 设置用户ID列表 + Set userIds = new HashSet<>(); + if (ObjectUtils.isEmpty(req.getUserId())) { + userIds = userId2Nickname.keySet(); + } else { + userIds.add(req.getUserId()); + } + req.setUserIds(userIds); + List userGroupDifficultyStatistics = this.baseMapper.getUserGroupDifficultyStatistics(req); // 按用户分组统计任务状态 @@ -811,12 +851,12 @@ public class NodeServiceImpl extends ServiceImpl statusCount = userStat.getDifficultyCount(); if (statusCount == null) { @@ -843,7 +883,7 @@ public class NodeServiceImpl extends ServiceImpl allExeStatus = new HashSet<>(); - if ("task".equals(req.getQueryType())) { + if (NodeTypeEnum.TASK.getValue().equals(req.getQueryType())) { // 处理任务完成情况统计 List commonCompleteStatisticsFromTask = this.baseMapper.getCommonCompleteStatisticsFromTask(req); @@ -875,7 +915,7 @@ public class NodeServiceImpl extends ServiceImpl commonCompleteStatisticsFromPerformance = this.baseMapper.getCommonCompleteStatisticsFromPerformance(req); diff --git a/project/src/main/resources/application-local.yml b/project/src/main/resources/application-local.yml index f1c18b9b..2fc986d2 100644 --- a/project/src/main/resources/application-local.yml +++ b/project/src/main/resources/application-local.yml @@ -83,9 +83,7 @@ mybatis-plus: logic-delete-value: 0 #showSql -logging: - level: - com.sdm.dao: debug +# MyBatis SQL日志通过logback.xml配置控制 lombok: anyConstructor: diff --git a/project/src/main/resources/logback.xml b/project/src/main/resources/logback.xml index 56bc69d5..654863d2 100644 --- a/project/src/main/resources/logback.xml +++ b/project/src/main/resources/logback.xml @@ -59,6 +59,12 @@ + + + + + + @@ -71,17 +77,39 @@ - - - - - + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/src/main/resources/mapper/SimulationNodeMapper.xml b/project/src/main/resources/mapper/SimulationNodeMapper.xml index 8231deca..801ca5eb 100644 --- a/project/src/main/resources/mapper/SimulationNodeMapper.xml +++ b/project/src/main/resources/mapper/SimulationNodeMapper.xml @@ -344,21 +344,17 @@ parameterType="com.sdm.project.model.req.GetUserGroupTaskCompleteStatisticsReq" resultType="com.sdm.project.model.vo.UserGroupTaskCompleteVo"> select task.exe_status as exeStatus, - task_member.user_id as userId, - su.nickname, - sur.groupId + task_member.user_id as userId from simulation_task task left join simulation_task_member task_member on task.uuid = task_member.task_id - LEFT JOIN sys_user su on task_member.user_id = su.id - left join sys_user_group_relation sur on sur.userId = su.id - task_member.user_id is not null and sur.groupId is not null - - and sur.groupId = #{req.userGroupId} - - - and task_member.user_id = #{req.userId} - + task_member.user_id in + ( + + #{userId} + + ) + and task.tag1 = #{req.tag1} @@ -397,21 +393,16 @@ resultType="com.sdm.project.model.vo.UserGroupDifficultyVo"> select task.difficult, - task_member.user_id as userId, - su.nickname, - sur.groupId + task_member.user_id as userId from simulation_task task left join simulation_task_member task_member on task.uuid = task_member.task_id - LEFT JOIN sys_user su on task_member.user_id = su.id - left join sys_user_group_relation sur on sur.userId = su.id - task_member.user_id is not null and sur.groupId is not null - - and sur.groupId = #{req.userGroupId} - - - and task_member.user_id = #{req.userId} - + task_member.user_id in + ( + + #{userId} + + ) and task.tag1 = #{req.tag1} @@ -455,7 +446,9 @@ from simulation_task task left join simulation_node node on task.${req.resultTagType} = node.uuid - 1=1 and task.exe_status is not null + 1=1 + and node.nodeName is not null and node.nodeName != '' + and task.exe_status is not null and task.tag1 = #{req.tag1} @@ -501,6 +494,8 @@ left join simulation_task task on performance.taskId = task.uuid left join simulation_node node on task.${req.resultTagType} = node.uuid + node.nodeName is not null and node.nodeName != '' + and performance.completeStatus is not null and task.tag1 = #{req.tag1} @@ -545,7 +540,9 @@ from simulation_task task left join simulation_node node on task.${req.resultTagType} = node.uuid - 1=1 and task.approval_status is not null + 1=1 + and node.nodeName is not null and node.nodeName != '' + and task.approval_status is not null and task.tag1 = #{req.tag1} diff --git a/submit/src/main/resources/logback.xml b/submit/src/main/resources/logback.xml index 8097f181..b235cae9 100644 --- a/submit/src/main/resources/logback.xml +++ b/submit/src/main/resources/logback.xml @@ -74,6 +74,13 @@ + + + + + + + @@ -86,10 +93,39 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/system/src/main/resources/logback.xml b/system/src/main/resources/logback.xml index ef70e6e2..b98e38de 100644 --- a/system/src/main/resources/logback.xml +++ b/system/src/main/resources/logback.xml @@ -63,6 +63,12 @@ + + + + + + @@ -75,17 +81,39 @@ - - - - - + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/task/src/main/resources/logback.xml b/task/src/main/resources/logback.xml index c2b020f1..78413dce 100644 --- a/task/src/main/resources/logback.xml +++ b/task/src/main/resources/logback.xml @@ -63,6 +63,12 @@ + + + + + + @@ -75,17 +81,41 @@ - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file