qinhouyu 1 year ago
parent
commit
5dfe374c8b

+ 2 - 5
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngiineeringPhotoServiceImpl.java

@@ -21,10 +21,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -228,7 +225,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
     @Override
     public Boolean deleteWithValidByurls(String url) {
         try {
-            obsService.deleteFile(url);
+            obsService.deleteFiles(Collections.singletonList(url));
         } catch (Exception e) {
 
         }

+ 2 - 2
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringPipeJackingServiceImpl.java

@@ -158,7 +158,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             }
         }
         //基建
-        else if("基建作业工程".equals(bo.getType())){
+        else if("基建工程".equals(bo.getType())){
             List<Map<String, Object>> civil = baseMapper.getInfrastructure(bo.getEnginId());
             if (!civil.isEmpty()){
                 add.setEnginName((String) civil.get(0).get("name"));
@@ -253,7 +253,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
                 update.setEnginName((String) civil.get(0).get("name"));
                 update.setEnginAddre((String) civil.get(0).get("address"));
             }
-        } else if ("基建作业工程".equals(type)) {
+        } else if ("基建工程".equals(type)) {
             civil = baseMapper.getInfrastructure(enginId);
             if (!civil.isEmpty()) {
                 update.setEnginName((String) civil.get(0).get("name"));