顶管节点插入提交

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

@@ -50,7 +50,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
      * 查询顶管工程
      */
     @Override
-    public ZEngineeringPipeJackingVo queryById(String id){
+    public ZEngineeringPipeJackingVo queryById(String id) {
         ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoById(id);
         ZEngiineeringPhotoBo bo1 = new ZEngiineeringPhotoBo();
         bo1.setParentId(jackingVo.getId());
@@ -63,11 +63,12 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
 
         return jackingVo;
     }
+
     /**
      * 查询顶管工程
      */
     @Override
-    public ZEngineeringPipeJackingVo queryByIdType(String id,String type){
+    public ZEngineeringPipeJackingVo queryByIdType(String id, String type) {
         ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoById(id);
 
         ZEngiineeringPhotoBo bo1 = new ZEngiineeringPhotoBo();
@@ -130,12 +131,12 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     /**
      * 新增顶管工程 PC
      */
-    @Transactional(rollbackFor=Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public Boolean insertByBo(ZEngineeringPipeJackingBo bo) {
         ZEngineeringPipeJacking add = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(add);
-        if (StringUtils.isEmpty(bo.getId())){
+        if (StringUtils.isEmpty(bo.getId())) {
             boolean flag = baseMapper.insert(add) > 0;
             if (flag) {
                 bo.setId(add.getId());
@@ -153,21 +154,21 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
                     photoService.insertBatch(list);
                 }
             }
-//            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
-//                bo.getzEngineeringNodeBo().setCivliId(add.getId());
-//                bo.getzEngineeringNodeBo().setCreateTime(new Date());
-//                nodeService.insert(bo.getzEngineeringNodeBo());
-//            }
             if (bo.getzEngineeringNodeBoList().size() > 0) { // 防止数据库节点表中有type为null的数据
-                for (ZEngineeringNodeBo zEngineeringNodeBo: bo.getzEngineeringNodeBoList()) {
+                for (ZEngineeringNodeBo zEngineeringNodeBo : bo.getzEngineeringNodeBoList()) {
                     zEngineeringNodeBo.setCivliId(add.getId());
                     zEngineeringNodeBo.setCreateTime(new Date());
                     nodeService.insert(zEngineeringNodeBo);
                 }
+            } else if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
+                bo.getzEngineeringNodeBo().setCivliId(add.getId());
+                bo.getzEngineeringNodeBo().setCreateTime(new Date());
+                if (StringUtils.isNotBlank(bo.getzEngineeringNodeBo().getType())) {
+                    nodeService.insert(bo.getzEngineeringNodeBo());
+                }
             }
             return flag;
-        }
-        else if (StringUtils.isNotBlank(bo.getId())){
+        } else if (StringUtils.isNotBlank(bo.getId())) {
             ZEngineeringPipeJackingVo voById = baseMapper.selectVoById(bo.getId());
             List<ZEngineeringNodeBo> zEngineeringNodeBoList = bo.getzEngineeringNodeBoList();
             ZEngineeringNodeBo entity = bo.getzEngineeringNodeBo();
@@ -198,7 +199,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         return false;
     }
 
-    @Transactional(rollbackFor=Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public Boolean insertByBoApp(ZEngineeringPipeJackingBo bo) {
         ZEngineeringPipeJacking add = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
@@ -207,15 +208,15 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         LambdaQueryWrapper<ZEngineeringPipeJacking> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getId()), ZEngineeringPipeJacking::getId, bo.getId());
         ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoOne(lqw);
-                ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
-                zEngineeringNodeBo.setCivliId(jackingVo.getId());
-                zEngineeringNodeBo.setType(zEngineeringNodeBo.getType());
-                zEngineeringNodeBo.setCreateTime(jackingVo.getCreateTime());
-                ZEngineeringNodeBo query = nodeService.query(zEngineeringNodeBo);
-                if (!ObjectUtils.isEmpty(query)) {
-                    zEngineeringNodeBo.setId(query.getId());
-                }
-                nodeService.insert(bo.getzEngineeringNodeBo());
+        ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
+        zEngineeringNodeBo.setCivliId(jackingVo.getId());
+        zEngineeringNodeBo.setType(zEngineeringNodeBo.getType());
+        zEngineeringNodeBo.setCreateTime(jackingVo.getCreateTime());
+        ZEngineeringNodeBo query = nodeService.query(zEngineeringNodeBo);
+        if (!ObjectUtils.isEmpty(query)) {
+            zEngineeringNodeBo.setId(query.getId());
+        }
+        nodeService.insert(bo.getzEngineeringNodeBo());
 
         return true;
     }
@@ -225,24 +226,23 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
      * 修改顶管工程 PC
      */
     @Override
-    @Transactional(rollbackFor=Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(ZEngineeringPipeJackingBo bo) {
         LambdaQueryWrapper<ZEngineeringPipeJacking> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(StringUtils.isNotEmpty(bo.getEnginName()),ZEngineeringPipeJacking::getEnginName,bo.getEnginName())
-                .ne(StringUtils.isNotEmpty(bo.getId()),ZEngineeringPipeJacking::getId,bo.getId());
+        wrapper.eq(StringUtils.isNotEmpty(bo.getEnginName()), ZEngineeringPipeJacking::getEnginName, bo.getEnginName()).ne(StringUtils.isNotEmpty(bo.getId()), ZEngineeringPipeJacking::getId, bo.getId());
         List<ZEngineeringPipeJacking> zEngineeringPipeJackings = baseMapper.selectList(wrapper);
-        if (zEngineeringPipeJackings.size() > 0){
+        if (zEngineeringPipeJackings.size() > 0) {
             return false;
         }
         ZEngineeringPipeJacking update = BeanUtil.toBean(bo, ZEngineeringPipeJacking.class);
         validEntityBeforeSave(update);
         int i = baseMapper.updateById(update);
-        if (i>0){
+        if (i > 0) {
             ZEngineeringPipeJackingVo jackingVo = baseMapper.selectVoById(update.getId());
             ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
-            if (!ObjectUtils.isEmpty(zEngineeringNodeBo)){
+            if (!ObjectUtils.isEmpty(zEngineeringNodeBo)) {
                 //多info
-                if (zEngineeringNodeBo.getzEngineeringInfoBoList()!=null&&!zEngineeringNodeBo.getzEngineeringInfoBoList().isEmpty()){
+                if (zEngineeringNodeBo.getzEngineeringInfoBoList() != null && !zEngineeringNodeBo.getzEngineeringInfoBoList().isEmpty()) {
                     List<ZEngineeringInfoBo> engineeringInfoBoList = zEngineeringNodeBo.getzEngineeringInfoBoList();
                     if (engineeringInfoBoList != null && !engineeringInfoBoList.isEmpty()) {
                         nodeService.updateMuch(zEngineeringNodeBo);
@@ -255,14 +255,14 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
                     nodeService.update(zEngineeringNodeBo);
                 }
             }
-            if (bo.getFiles()!=null&&!bo.getFiles().isEmpty()) {
-                this.doPhotos(update,bo);
+            if (bo.getFiles() != null && !bo.getFiles().isEmpty()) {
+                this.doPhotos(update, bo);
             }
         }
-        return i>0;
+        return i > 0;
     }
 
-    private void doPhotos(ZEngineeringPipeJacking update,ZEngineeringPipeJackingBo bo) {
+    private void doPhotos(ZEngineeringPipeJacking update, ZEngineeringPipeJackingBo bo) {
         List<ZEngiineeringPhoto> list = new ArrayList<>();
 
         // 查询数据库中已存在的文件列表
@@ -270,9 +270,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         bo1.setParentId(update.getId());
         bo1.setCreateTime(update.getCreateTime());
         List<ZEngiineeringPhotoVo> queriedList = photoService.queryList(bo1);
-        List<String> existingPhotos = queriedList.stream()
-            .map(ZEngiineeringPhotoVo::getPicUrl)
-            .collect(Collectors.toList());
+        List<String> existingPhotos = queriedList.stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
 
         // 插入前端传来的新文件
         for (ZFileBo pic : bo.getFiles()) {
@@ -290,12 +288,10 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         }
 
         // 删除数据库中多余的文件
-        List<String> photosToDelete = existingPhotos.stream()
-            .filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic))
-            .collect(Collectors.toList());
+        List<String> photosToDelete = existingPhotos.stream().filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic)).collect(Collectors.toList());
         if (!photosToDelete.isEmpty()) {
-            photosToDelete.forEach(item->{
-                ZEngiineeringPhoto zEngiineeringPhoto=new ZEngiineeringPhoto();
+            photosToDelete.forEach(item -> {
+                ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
                 zEngiineeringPhoto.setPicUrl(item);
                 zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
                 photoService.deleteWithValid(zEngiineeringPhoto);
@@ -311,7 +307,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(ZEngineeringPipeJacking entity){
+    private void validEntityBeforeSave(ZEngineeringPipeJacking entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -319,7 +315,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
      * 批量删除顶管工程
      */
     @Override
-    @Transactional(rollbackFor=Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         //TODO 做一些业务上的校验,判断是否需要校验
         ids.forEach(item -> {
@@ -328,9 +324,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
             zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
             zEngineeringNodeBo.setCivliId(vo.getId());
             List<ZEngineeringNodeBo> zEngineeringNodeBos = nodeService.queryListDetails(zEngineeringNodeBo);
-            zEngineeringNodeBos.forEach(ite ->
-                nodeService.delete(ite)
-            );
+            zEngineeringNodeBos.forEach(ite -> nodeService.delete(ite));
         });
         return baseMapper.deleteBatchIds(ids) > 0;
     }