Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEnginSpecificationsController.java

@@ -55,6 +55,13 @@ public class ZEnginSpecificationsController extends BaseController {
         return R.ok(iZEnginSpecificationsService.getEnginSpecifications(materId));
     }
     /**
+     * 全部材质规格
+     */
+    @GetMapping("/getEnginSpecificationsListAll")
+    public R getEnginSpecificationsListAll() {
+        return R.ok(iZEnginSpecificationsService.getEnginSpecificationsListAll());
+    }
+    /**
      * 导出工程材质规格列表
      */
     @SaCheckPermission("zdsz:enginSpecifications:export")

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringDangerousController.java

@@ -70,7 +70,7 @@ public class ZEngineeringDangerousController extends BaseController {
     @GetMapping("/query/{id}")
     public R<ZEngineeringDangerousVo> query(@NotNull(message = "主键不能为空")
                                                 @PathVariable String id) {
-        return R.ok(iZEngineeringDangerousService.query(id));
+        return R.ok(iZEngineeringDangerousService.queryById(id));
     }
 
     /**
@@ -82,7 +82,7 @@ public class ZEngineeringDangerousController extends BaseController {
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringDangerousBo bo) {
         bo.setCreateTime(new Date());
-        return toAjax(iZEngineeringDangerousService.insert(bo));
+        return toAjax(iZEngineeringDangerousService.insertByBo(bo));
     }
 
     /**
@@ -94,7 +94,7 @@ public class ZEngineeringDangerousController extends BaseController {
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringDangerousBo bo) {
         bo.setCreateTime(new Date());
-        return toAjax(iZEngineeringDangerousService.update(bo));
+        return toAjax(iZEngineeringDangerousService.updateByBo(bo));
     }
 
     /**

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringPipeJackingVo.java

@@ -2,6 +2,7 @@ package com.ruoyi.zdsz.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
 import com.ruoyi.common.core.domain.BaseEntity;
@@ -80,7 +81,9 @@ public class ZEngineeringPipeJackingVo extends BaseEntity implements Serializabl
     @ExcelProperty(value = "备注")
     private String remark;
 
+    @JsonProperty("zEngineeringNodeBoList")
     private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+    @JsonProperty("pics")
     private List<ZEngiineeringPhotoVo> pics;
 
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEnginSpecificationsMapper.java

@@ -22,4 +22,6 @@ public interface ZEnginSpecificationsMapper extends BaseMapperPlus<ZEnginSpecifi
     ZEnginSpecificationsVo getById(String id);
 
     List<ZEnginSpecificationsVo> getEnginSpecifications(String materId);
+
+    List<ZEnginSpecificationsVo> getEnginSpecificationsListAll();
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEnginSpecificationsService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.zdsz.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.zdsz.domain.ZEnginSpecifications;
 import com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo;
 import com.ruoyi.zdsz.domain.bo.ZEnginSpecificationsBo;
@@ -48,4 +49,6 @@ public interface IZEnginSpecificationsService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     List<ZEnginSpecificationsVo> getEnginSpecifications(String materId);
+
+    List<ZEnginSpecificationsVo> getEnginSpecificationsListAll();
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringDangerousService.java

@@ -52,4 +52,23 @@ public interface IZEngineeringDangerousService {
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 
     ZEngineeringDangerousVo queryEngineeringDangerous(String id);
+
+
+    /**
+     * 查询危险工程(无节点)
+     */
+    ZEngineeringDangerousVo queryById(String id);
+
+
+
+    /**
+     * 新增危险工程(无节点)
+     */
+    Boolean insertByBo(ZEngineeringDangerousBo bo);
+
+    /**
+     * 修改危险工程(无节点)
+     */
+    Boolean updateByBo(ZEngineeringDangerousBo bo);
+
 }

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) {
 
         }

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

@@ -114,4 +114,9 @@ public class ZEnginSpecificationsServiceImpl implements IZEnginSpecificationsSer
     public List<ZEnginSpecificationsVo> getEnginSpecifications(String materId) {
         return baseMapper.getEnginSpecifications(materId);
     }
+
+    @Override
+    public List<ZEnginSpecificationsVo> getEnginSpecificationsListAll() {
+        return baseMapper.getEnginSpecificationsListAll();
+    }
 }

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

@@ -65,9 +65,9 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
      * 查询危险工程详情
      */
     @Override
-    public ZEngineeringDangerousVo query(String id)  {
+    public ZEngineeringDangerousVo query(String id) {
         ZEngineeringDangerousVo vo = baseMapper.selectVoById(id);
-        ZEngiineeringPhotoBo bo= new ZEngiineeringPhotoBo();
+        ZEngiineeringPhotoBo bo = new ZEngiineeringPhotoBo();
         bo.setParentId(vo.getId());
         bo.setCreateTime(vo.getCreateTime());
         vo.setPics(photoService.queryList(bo));
@@ -102,7 +102,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
      * 新增危险工程
      */
     @Override
-    @Transactional(rollbackFor=Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     @DynamicName(spel = "#bo.createTime")
     public Boolean insert(ZEngineeringDangerousBo bo) {
         ZEngineeringDangerous add = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
@@ -114,9 +114,9 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         bo.getzEngineeringNodeBo().setCivliId(add.getId());
         bo.getzEngineeringNodeBo().setCreateTime(add.getCreateTime());
         ZEngineeringNode entity = izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
-        if (!ObjectUtil.isEmpty(entity)){
+        if (!ObjectUtil.isEmpty(entity)) {
             List<ZEngiineeringPhoto> list = new ArrayList<>();
-            bo.getFiles().stream().forEach(o->{
+            bo.getFiles().stream().forEach(o -> {
                 ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
                 pic.setParentId(bo.getId());
                 pic.setPicUrl(o.getUrl());
@@ -142,13 +142,13 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
     public Boolean update(ZEngineeringDangerousBo bo) {
         ZEngineeringDangerous update = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
         validEntityBeforeSave(update);
-        ZEngineeringNodeBo zEngineeringNodeBo =bo.getzEngineeringNodeBo();
+        ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
         zEngineeringNodeBo.setCivliId(update.getId());
         zEngineeringNodeBo.setId(baseMapper.selectIdByCid(zEngineeringNodeBo.getCivliId()));
         zEngineeringNodeBo.setCreateTime(update.getCreateTime());
         izEngineeringNodeService.update(zEngineeringNodeBo);
         int i = baseMapper.updateById(update);
-        if (i>0){
+        if (i > 0) {
             List<ZEngiineeringPhoto> list = new ArrayList<>();
 
             // 查询数据库中已存在的文件列表
@@ -176,7 +176,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
                 .filter(pic -> !bo.getFiles().stream().map(ZFileBo::getUrl).collect(Collectors.toList()).contains(pic))
                 .collect(Collectors.toList());
             if (!photosToDelete.isEmpty()) {
-                photosToDelete.forEach(item->{
+                photosToDelete.forEach(item -> {
                     photoService.deleteWithValidByurls(item);
                 });
             }
@@ -192,7 +192,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(ZEngineeringDangerous entity){
+    private void validEntityBeforeSave(ZEngineeringDangerous entity) {
         //TODO 做一些数据校验,如唯一约束
     }
 
@@ -201,7 +201,7 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
         ids.forEach(item -> {
@@ -217,7 +217,9 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 
-
+    /**
+     * 危险工程历史
+     */
     @Override
     public ZEngineeringDangerousVo queryEngineeringDangerous(String id) {
         ZEngineeringDangerousVo vo = baseMapper.selectVoById(id);
@@ -227,4 +229,96 @@ public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousS
         vo.setzEngineeringNodeBoList(izEngineeringNodeService.queryListDetails(zEngineeringNodeBo));
         return vo;
     }
+
+
+    /**
+     * 新增危险工程（无节点）
+     */
+    @Override
+    public Boolean insertByBo(ZEngineeringDangerousBo bo) {
+        ZEngineeringDangerous add = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        if (!bo.getFiles().isEmpty()) {
+            List<ZEngiineeringPhoto> list = new ArrayList<>();
+            bo.getFiles().stream().forEach(o -> {
+                ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
+                pic.setParentId(bo.getId());
+                pic.setPicUrl(o.getUrl());
+                pic.setUpdateBy(String.valueOf(LoginHelper.getUserId()));
+                pic.setUpdateTime(new Date());
+                pic.setCreateTime(bo.getCreateTime());
+                list.add(pic);
+            });
+            if (!list.isEmpty()) {
+                photoService.insertBatch(list);
+            }
+        }
+        return flag;
+    }
+
+    /**
+     * 修改危险工程（无节点）
+     */
+    @Override
+    public Boolean updateByBo(ZEngineeringDangerousBo bo) {
+        ZEngineeringDangerous update = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
+        validEntityBeforeSave(update);
+        int i = baseMapper.updateById(update);
+        if (i > 0) {
+            List<ZEngiineeringPhoto> list = new ArrayList<>();
+
+            // 查询数据库中已存在的文件列表
+            ZEngiineeringPhotoBo bo1 = new ZEngiineeringPhotoBo();
+            bo1.setParentId(update.getId());
+            List<String> existingPhotos = photoService.queryList(bo1).stream()
+                .map(ZEngiineeringPhotoVo::getPicUrl)
+                .collect(Collectors.toList());
+
+            // 插入前端传来的新文件
+            for (ZFileBo pic : bo.getFiles()) {
+                if (!existingPhotos.contains(pic.getUrl())) {
+                    ZEngiineeringPhoto newPhoto = new ZEngiineeringPhoto();
+                    newPhoto.setParentId(bo.getId());
+                    newPhoto.setPicUrl(pic.getUrl());
+                    newPhoto.setFileName(pic.getName());
+                    newPhoto.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                    newPhoto.setCreateTime(new Date());
+                    list.add(newPhoto);
+                }
+            }
+
+            // 删除数据库中多余的文件
+            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 -> {
+                    photoService.deleteWithValidByurls(item);
+                });
+            }
+
+            // 批量插入新图片
+            if (!list.isEmpty()) {
+                photoService.insertBatch(list);
+            }
+        }
+        return i > 0;
+    }
+
+    /**
+     * 查询危险工程（无节点）
+     */
+    @Override
+    public ZEngineeringDangerousVo queryById(String id) {
+        ZEngineeringDangerousVo vo = baseMapper.selectVoById(id);
+        ZEngiineeringPhotoBo bo = new ZEngiineeringPhotoBo();
+        bo.setParentId(vo.getId());
+        bo.setCreateTime(vo.getCreateTime());
+        vo.setPics(photoService.queryList(bo));
+        return vo;
+    }
 }

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"));
@@ -197,6 +197,8 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
                         pic.setParentId(bo.getId());
                         pic.setPicUrl(o.getUrl());
                         pic.setFileName(o.getName());
+                        pic.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                        pic.setCreateTime(new Date());
                         pic.setUpdateBy(String.valueOf(LoginHelper.getUserId()));
                         pic.setUpdateTime(new Date());
                         list.add(pic);
@@ -251,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"));

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZEnginSpecificationsMapper.xml

@@ -44,10 +44,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
     </select>
+
     <select id="getEnginSpecifications" resultType="com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo">
         select * from z_engin_specifications as ze where ze.del_flag = '0'
         <if test="materId != null and materId != ''">
             and ze.mater_id = #{materId}
         </if>
     </select>
+
+    <select id="getEnginSpecificationsListAll" resultType="com.ruoyi.zdsz.domain.vo.ZEnginSpecificationsVo">
+        select * from z_engin_specifications as ze where ze.del_flag = '0'
+    </select>
 </mapper>