From da90c3c6260f2ebb525445c1534bef386f71bac1 Mon Sep 17 00:00:00 2001
From: zhuxinru <zhuxinru@honeycombis.com>
Date: Thu, 4 Dec 2025 10:00:35 +0800
Subject: [PATCH] fix:bug

---
 .../feign/inter/system/IMessageFeignClient.java  |  2 +-
 .../sdm/common/service/UserNameCacheService.java | 16 +++++++++-------
 .../com/sdm/project/model/req/KeyResultReq.java  |  3 +++
 .../project/service/impl/DemandServiceImpl.java  |  2 +-
 .../service/impl/SimulationRunServiceImpl.java   |  2 +-
 .../resources/mapper/SimulationProjectMapper.xml |  3 ++-
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/common/src/main/java/com/sdm/common/feign/inter/system/IMessageFeignClient.java b/common/src/main/java/com/sdm/common/feign/inter/system/IMessageFeignClient.java
index 3eca9ede..03d6098e 100644
--- a/common/src/main/java/com/sdm/common/feign/inter/system/IMessageFeignClient.java
+++ b/common/src/main/java/com/sdm/common/feign/inter/system/IMessageFeignClient.java
@@ -10,6 +10,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 @FeignClient(name = "system",contextId = "systemMessageClient")
 public interface IMessageFeignClient {
 
-    @PostMapping("/systemMsg//sendMessage")
+    @PostMapping("/systemMsg/sendMessage")
     SdmResponse sendMessage(@RequestBody SendMsgReq req);
 }
diff --git a/common/src/main/java/com/sdm/common/service/UserNameCacheService.java b/common/src/main/java/com/sdm/common/service/UserNameCacheService.java
index e5a639b1..cf6543a1 100644
--- a/common/src/main/java/com/sdm/common/service/UserNameCacheService.java
+++ b/common/src/main/java/com/sdm/common/service/UserNameCacheService.java
@@ -5,6 +5,7 @@ import com.sdm.common.entity.req.system.UserQueryReq;
 import com.sdm.common.entity.resp.system.CIDUserResp;
 import com.sdm.common.feign.inter.system.ISysUserFeignClient;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -25,17 +26,18 @@ public class UserNameCacheService {
     @Cacheable(value = "userNames", key = "#userIds.toString()")
     public Map<Long, String> batchGetUserNames(Set<Long> userIds) {
         log.info("【缓存未命中】批量查询用户名，用户数量: {}", userIds.size());
-
+        Map<Long, String> userMap = new HashMap<>();
         // 批量调用用户服务
         SdmResponse<List<CIDUserResp>> response = sysUserFeignClient.listUserByIds(
                 UserQueryReq.builder().userIds(new ArrayList<>(userIds)).build()
         );
-
-        Map<Long, String> userMap = response.getData().stream()
-                .collect(Collectors.toMap(
-                        CIDUserResp::getUserId,
-                        CIDUserResp::getNickname
-                ));
+        if (CollectionUtils.isNotEmpty(response.getData())) {
+            userMap = response.getData().stream()
+                    .collect(Collectors.toMap(
+                            CIDUserResp::getUserId,
+                            CIDUserResp::getNickname
+                    ));
+        }
 
         return userMap;
     }
diff --git a/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java b/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java
index 3ee0479a..8a24f83a 100644
--- a/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java
+++ b/project/src/main/java/com/sdm/project/model/req/KeyResultReq.java
@@ -71,6 +71,9 @@ public class KeyResultReq extends BaseReq {
     @Schema(description = "文件")
     private MultipartFile file;
 
+    @Schema(description = "是否仅曲线上传文件")
+    private boolean onlyFile;
+
     /**
      * -------------------------------------------------上传交付物使用参数------------------------------------------------
      */
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 ff57aad2..90e4c9d4 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
@@ -158,7 +158,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
         SdmResponse response = dataClientFeignClient.createDir(createDirReq);
         log.info("创建需求时，调用创建文件夹的返回值为：{}", response);
 
-        return SdmResponse.success(demandId);
+        return SdmResponse.success(req.getUuid());
     }
 
     @Transactional
diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
index b67a4800..7c8cb31e 100644
--- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
@@ -743,7 +743,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
     @Override
     @Transactional(rollbackFor = Exception.class)
     public SdmResponse addSimulationKeyResult(KeyResultReq req) {
-        if (KeyResultTypeEnum.CURVE.getKeyResultType().equals(req.getKeyResultType())) {
+        if (KeyResultTypeEnum.CURVE.getKeyResultType().equals(req.getKeyResultType()) && req.isOnlyFile()) {
             CurveParamDto curveParamDto = getCurveParamsFromUpload(req.getFile(), 2);
             return SdmResponse.success(curveParamDto);
         }
diff --git a/project/src/main/resources/mapper/SimulationProjectMapper.xml b/project/src/main/resources/mapper/SimulationProjectMapper.xml
index 99025f45..591e88fc 100644
--- a/project/src/main/resources/mapper/SimulationProjectMapper.xml
+++ b/project/src/main/resources/mapper/SimulationProjectMapper.xml
@@ -53,7 +53,8 @@
             #{it.tag3,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag4,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
             #{it.tag5,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag6,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
             #{it.tag7,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag8,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
-            #{it.tag9,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag10,typeHandler=com.sdm.project.handler.ListStringTypeHandler}),#{it.imageFileId}
+            #{it.tag9,typeHandler=com.sdm.project.handler.ListStringTypeHandler},#{it.tag10,typeHandler=com.sdm.project.handler.ListStringTypeHandler},
+            #{it.imageFileId})
         </foreach>
     </insert>