新增开栓施工

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

@@ -114,6 +114,7 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
      * 查询照片列表
      */
     @Override
+    @DynamicName(spel = "#bo.createTime")
     public List<ZEngiineeringPhotoVo> queryList(ZEngiineeringPhotoBo bo) {
         LambdaQueryWrapper<ZEngiineeringPhoto> lqw = buildQueryWrapper(bo);
         return baseMapper.selectVoList(lqw);

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringAirWallServiceImpl.java

@@ -258,6 +258,69 @@ public class ZEngineeringAirWallServiceImpl implements IZEngineeringAirWallServi
                     photoService.insertBatch(list);
                 }
             }
+            /**
+             * 管道厚度
+             */
+//            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo().getzEngineeringInfoBo().getIronPipelineThickness())) {
+            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo().getzEngineeringInfoBoList().get(0).getIronPipelineThickness())) {
+                List<ZEngiineeringPhoto> list = new ArrayList<>();
+                // 查询数据库中已存在的文件列表
+                ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
+                zEngiineeringPhotoBo.setCreateTime(bo.getzEngineeringNodeBo().getzEngineeringInfoBoList().get(0).getCreateTime());//
+//                zEngiineeringPhotoBo.setParentId(update.getId());
+                zEngiineeringPhotoBo.setParentId(bo.getzEngineeringNodeBo().getzEngineeringInfoBoList().get(0).getId());
+                List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
+                // 插入前端传来的新文件
+//                for (ZFileBo pic : bo.getzEngineeringNodeBo().getzEngineeringInfoBo().getIronPipelineThickness()) {
+                for (String pic : bo.getzEngineeringNodeBo().getzEngineeringInfoBo().getIronPipelineThickness()) {
+                    if (!existingPhotos.contains(pic)) {
+                        ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
+//                        newPhoto.setParentId(bo.getId());
+                        newPhoto.setParentId(bo.getzEngineeringNodeBo().getzEngineeringInfoBoList().get(0).getId());
+                        newPhoto.setPicUrl(pic);
+                        newPhoto.setFileName(pic);
+                        newPhoto.setType("ironPipelineThickness");
+                        newPhoto.setCreateBy(String.valueOf(LoginHelper.getUsername()));
+                        newPhoto.setCreateTime(bo.getCreateTime());
+                        newPhoto.setUpdateTime(new Date());
+                        list.add(newPhoto);
+                    }
+                }
+                // 删除数据库中多余的文件
+                List<String> photosToDelete = existingPhotos.stream().filter(pic -> !bo.getzEngineeringNodeBo().getzEngineeringInfoBo().getIronPipelineThickness().contains(pic)).collect(Collectors.toList());
+                if (!photosToDelete.isEmpty()) {
+                    photosToDelete.forEach(item -> {
+                        ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                        zEngiineeringPhoto.setType("ironPipelineThickness");
+                        zEngiineeringPhoto.setPicUrl(item);
+                        zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                        photoService.deleteWithValid(zEngiineeringPhoto);
+                    });
+                }
+                // 批量插入新图片
+                if (!list.isEmpty()) {
+                    photoService.insertBatch(list);
+                }
+            }else {
+                List<ZEngiineeringPhoto> list = new ArrayList<>();
+                // 查询数据库中已存在的文件列表
+                ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
+                zEngiineeringPhotoBo.setCreateTime(bo.getzEngineeringNodeBo().getzEngineeringInfoBoList().get(0).getCreateTime());//
+//                zEngiineeringPhotoBo.setParentId(update.getId());
+                zEngiineeringPhotoBo.setParentId(bo.getzEngineeringNodeBo().getzEngineeringInfoBoList().get(0).getId());
+                List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
+                // 删除数据库中多余的文件
+                List<String> photosToDelete = existingPhotos.stream().filter(pic -> !bo.getzEngineeringNodeBo().getzEngineeringInfoBo().getIronPipelineThickness().contains(pic)).collect(Collectors.toList());
+                if (!photosToDelete.isEmpty()) {
+                    photosToDelete.forEach(item -> {
+                        ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                        zEngiineeringPhoto.setType("ironPipelineThickness");
+                        zEngiineeringPhoto.setPicUrl(item);
+                        zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                        photoService.deleteWithValid(zEngiineeringPhoto);
+                    });
+                }
+            }
         }
         if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())){
             List<ZEngineeringInfoBo> engineeringInfoBoList1 = bo.getzEngineeringNodeBo().getzEngineeringInfoBoList();