From c99b235d8f8a5779b61ee9aac30e4df2f99f2350 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 26 Sep 2024 14:49:20 +0800
Subject: [PATCH] =?UTF-8?q?null=E6=8C=87=E9=92=88=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CarryCapacityResultPOServiceImpl.java      | 13 ++++++++-----
 .../java/com/njcn/oss/utils/FileStorageUtil.java    |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityResultPOServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityResultPOServiceImpl.java
index ee4e4d012..2d2406c95 100644
--- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityResultPOServiceImpl.java
+++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityResultPOServiceImpl.java
@@ -65,12 +65,15 @@ public class CarryCapacityResultPOServiceImpl extends ServiceImpl<CarryCapacityR
                 List<CarryCapacityDResultVO.CarryCapacityIResult> list = JSONUtil.toList(JSONUtil.toJsonStr(iResultList), CarryCapacityDResultVO.CarryCapacityIResult.class);
                 vo.setIResultList(list);
             }
-            if(Objects.nonNull(vo.getLineId())){
+            if(StringUtils.isNotBlank(vo.getLineId())){
                 LineDetailVO data = lineFeignClient.getLineSubGdDetail(vo.getLineId()).getData();
-                vo.setLineName(data.getGdName()+"->"
-                        +data.getSubName()+"->"
-                        +data.getDevName()+"->"
-                        +data.getLineName());
+                if(Objects.nonNull(data)){
+                    vo.setLineName(data.getGdName()+"->"
+                            +data.getSubName()+"->"
+                            +data.getDevName()+"->"
+                            +data.getLineName());
+                }
+
             }
 
             return vo;
diff --git a/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java b/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java
index dde196cd7..bf0814365 100644
--- a/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java
+++ b/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java
@@ -116,7 +116,7 @@ public class FileStorageUtil {
     public String uploadStream(InputStream inputStream, String dir, String fileName) {
         String filePath;
         if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS) {
-            filePath = dir + minIoUtils.minFileName(fileName);
+            filePath = dir + minIoUtils.minFileName(fileName,true);
             obsUtil.uploadStream(inputStream, filePath);
         } else {
             try {