null指针处理

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()+"->"
+                if(Objects.nonNull(data)){
-                        +data.getSubName()+"->"
+                    vo.setLineName(data.getGdName()+"->"
-                        +data.getDevName()+"->"
+                            +data.getSubName()+"->"
-                        +data.getLineName());
+                            +data.getDevName()+"->"
+                            +data.getLineName());
+                }
+
             }
 
             return vo;

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 {