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

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

@@ -0,0 +1,139 @@
+package com.ruoyi.web.controller.zdsz;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringAirWallBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringAirWallVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+import com.ruoyi.zdsz.service.IZEngineeringAirWallService;
+import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 带气封堵施工
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/engineeringAirWall")
+public class ZEngineeringAirWallController extends BaseController {
+
+    private final IZEngineeringAirWallService iZEngineeringAirWallService;
+
+    /**
+     * 查询,带气封堵施工列表
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngineeringAirWallVo> list(ZEngineeringAirWallBo bo, PageQuery pageQuery, String type) {
+//        bo.setType(type);
+        return iZEngineeringAirWallService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出,带气封堵施工列表
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:export")
+    @Log(title = ",带气封堵施工", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngineeringAirWallBo bo, HttpServletResponse response) {
+        List<ZEngineeringAirWallVo> list = iZEngineeringAirWallService.queryList(bo);
+        ExcelUtil.exportExcel(list, "带气封堵施工", ZEngineeringAirWallVo.class, response);
+    }
+
+    /**
+     * 获取,带气封堵施工详细信息
+     *
+     * @param id 主键
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringAirWallVo> getInfo(@NotNull(message = "主键不能为空")@PathVariable String id) {
+        return R.ok(iZEngineeringAirWallService.queryById(id));
+    }
+
+    /**
+     * 新增,带气封堵施工
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:add")
+    @Log(title = ",带气封堵施工", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringAirWallBo bo) {
+        return toAjax(iZEngineeringAirWallService.insertByBo(bo));
+    }
+
+    /**
+     * 修改,带气封堵施工
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:edit")
+    @Log(title = ",带气封堵施工", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringAirWallBo bo) {
+        return toAjax(iZEngineeringAirWallService.updateByBo(bo));
+    }
+
+    /**
+     * 删除,带气封堵施工
+     *
+     * @param ids 主键串
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:remove")
+    @Log(title = ",带气封堵施工", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")@PathVariable String[] ids) {
+        return toAjax(iZEngineeringAirWallService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * ,带气封堵施工历史
+     *
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:query")
+    @GetMapping("/{id}/{type}")
+    public R<ZEngineeringAirWallVo> query(@NotNull(message = "主键不能为空") @PathVariable String id, @PathVariable String type) {
+        return R.ok(iZEngineeringAirWallService.query(id, type));
+    }
+
+    /**
+     * ,带气封堵施工根据工程类型查询工程名称
+     */
+    @GetMapping("/queryNameByType")
+//    @SaCheckPermission("zdsz:engineeringIndustry:type")
+    public R<List<ZEngineeringIndustryTypeVo>> queryNameByType(ZEngineeringAirWallBo bo) {
+        return R.ok(iZEngineeringAirWallService.queryNameByType(bo));
+    }
+
+    /**
+     * ,带气封堵施工修改工程
+     */
+    @PutMapping("/updateNodeByBo")
+    @Log(title = ",带气封堵施工", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+//    @SaCheckPermission("zdsz:engineeringIndustry:removeNode")
+    public R<Void> updateNodeByBo(@Validated(EditGroup.class) @RequestBody ZEngineeringAirWallBo bo) {
+        return toAjax(iZEngineeringAirWallService.updateNodeByBo(bo));
+    }
+
+}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringAirWall.java

@@ -0,0 +1,107 @@
+package com.ruoyi.zdsz.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 带气封堵施工对象 z_engineering_air_wall
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("z_engineering_air_wall")
+public class ZEngineeringAirWall extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private String id;
+//    /**
+//     * 工程类型
+//     */
+//    private String enginType;
+//    /**
+//     * 建筑单位
+//     */
+//    private String constructUnit;
+//    /**
+//     * 项目负责人
+//     */
+//    private String projectHead;
+//    /**
+//     * 现场负责人
+//     */
+//    private String sceneHead;
+//    /**
+//     * 设计单位
+//     */
+//    private String designUnit;
+//    /**
+//     * 设计负责人
+//     */
+//    private String designHead;
+//    /**
+//     * 设计联系电话
+//     */
+//    private String designPhone;
+//    /**
+//     * 监理单位
+//     */
+//    private String supervisionUnit;
+//    /**
+//     * 监理负责人
+//     */
+//    private String supervisionHead;
+//    /**
+//     * 监理联系电话
+//     */
+//    private String supervisionPhone;
+//    /**
+//     * 类型(带气封堵施工)
+//     */
+//    private String type;
+    /**
+     * 工程名称
+     */
+    private String enginName;
+
+//    /**
+//     * 工程分类
+//     */
+//    private String enginClassification;
+//
+//    /**
+//     * 字典项
+//     * municipal_engineering_node
+//     * 市政工程节点类型(沟上施工|沟下施工)
+//     */
+//    private String municipalEngineeringNode;
+
+    /**
+     * 乐观锁
+     */
+    @Version
+    private  Long version;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 删除标识
+     */
+    @TableLogic
+    private String delFlag;
+
+
+
+}

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringAirWallBo.java

@@ -0,0 +1,121 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 带气封堵施工业务对象 z_engineering_air_wall
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZEngineeringAirWallBo extends BaseEntity {
+
+    /**
+     *
+     */
+    private String id;
+
+//    /**
+//     * 工程类型
+//     */
+//    private String enginType;
+//
+//    /**
+//     * 建筑单位
+//     */
+//    private String constructUnit;
+//
+//    /**
+//     * 项目负责人
+//     */
+//    private String projectHead;
+//
+//    /**
+//     * 现场负责人
+//     */
+//    private String sceneHead;
+//
+//    /**
+//     * 设计单位
+//     */
+//    private String designUnit;
+//
+//    /**
+//     * 设计负责人
+//     */
+//    private String designHead;
+//
+//    /**
+//     * 设计联系电话
+//     */
+//    private String designPhone;
+//
+//    /**
+//     * 监理单位
+//     */
+//    private String supervisionUnit;
+//
+//    /**
+//     * 监理负责人
+//     */
+//    private String supervisionHead;
+//
+//    /**
+//     * 监理联系电话
+//     */
+//    private String supervisionPhone;
+
+    /**
+     * 工程名称
+     */
+    private String enginName;
+
+//    /**
+//     * 工程分类
+//     */
+//    private String enginClassification;
+//
+//    /**
+//     * 类型(带气封堵施工)
+//     */
+//    private String type;
+//
+//    /**
+//     * 字典项
+//     * municipal_engineering_node
+//     * 市政工程节点类型(沟上施工|沟下施工)
+//     */
+//    private String municipalEngineeringNode;
+
+    private ZEngineeringNodeBo zEngineeringNodeBo;
+
+    /**
+     * 附件
+     */
+    private List<ZFileBo> files;
+
+    public ZEngineeringNodeBo getzEngineeringNodeBo() {
+        return zEngineeringNodeBo;
+    }
+
+    public void setzEngineeringNodeBo(ZEngineeringNodeBo zEngineeringNodeBo) {
+        this.zEngineeringNodeBo = zEngineeringNodeBo;
+    }
+
+    private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+
+    public List<ZEngineeringNodeBo> getzEngineeringNodeBoList() {
+        return zEngineeringNodeBoList;
+    }
+
+    public void setzEngineeringNodeBoList(List<ZEngineeringNodeBo> zEngineeringNodeBoList) {
+        this.zEngineeringNodeBoList = zEngineeringNodeBoList;
+    }
+}

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

@@ -0,0 +1,124 @@
+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.core.domain.BaseEntity;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringNodeBo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 带气封堵施工视图对象 z_engineering_air_wall
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringAirWallVo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private String id;
+
+//    /**
+//     * 工程类型
+//     */
+//    @ExcelProperty(value = "工程类型")
+//    private String enginType;
+//
+//    /**
+//     * 建筑单位
+//     */
+//    @ExcelProperty(value = "建筑单位")
+//    private String constructUnit;
+//
+//    /**
+//     * 项目负责人
+//     */
+//    @ExcelProperty(value = "项目负责人")
+//    private String projectHead;
+//
+//    /**
+//     * 现场负责人
+//     */
+//    @ExcelProperty(value = "现场负责人")
+//    private String sceneHead;
+//
+//    /**
+//     * 设计单位
+//     */
+//    @ExcelProperty(value = "设计单位")
+//    private String designUnit;
+//
+//    /**
+//     * 设计负责人
+//     */
+//    @ExcelProperty(value = "设计负责人")
+//    private String designHead;
+//
+//    /**
+//     * 设计联系电话
+//     */
+//    @ExcelProperty(value = "设计联系电话")
+//    private String designPhone;
+//
+//    /**
+//     * 监理单位
+//     */
+//    @ExcelProperty(value = "监理单位")
+//    private String supervisionUnit;
+//
+//    /**
+//     * 监理负责人
+//     */
+//    @ExcelProperty(value = "监理负责人")
+//    private String supervisionHead;
+//
+//    /**
+//     * 监理联系电话
+//     */
+//    @ExcelProperty(value = "监理联系电话")
+//    private String supervisionPhone;
+//
+//    /**
+//     * 类型(带气封堵施工)
+//     */
+//    @ExcelProperty(value = "类型(带气封堵施工)")
+//    private String type;
+
+    /**
+     * 工程名称
+     */
+    @ExcelProperty(value = "工程名称")
+    private String enginName;
+
+//    /**
+//     * 工程分类
+//     */
+//    @ExcelProperty(value = "工程分类")
+//    private String enginClassification;
+//
+//    /**
+//     * 字典项
+//     * municipal_engineering_node
+//     * 市政工程节点类型(沟上施工|沟下施工)
+//     */
+//    private String municipalEngineeringNode;
+
+    @JsonProperty("zEngineeringNodeBo")
+    private ZEngineeringNodeBo zEngineeringNodeBo;
+
+    @JsonProperty("zEngineeringNodeBoList")
+    private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
+
+
+    private List<ZEngiineeringPhotoVo> pics;
+
+}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.zdsz.domain.ZEngineeringAirWall;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringAirWallVo;
+
+/**
+ * 带气封堵施工Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+public interface ZEngineeringAirWallMapper extends BaseMapperPlus<ZEngineeringAirWallMapper, ZEngineeringAirWall, ZEngineeringAirWallVo> {
+
+}

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

@@ -84,5 +84,5 @@ public interface IZEngiineeringPhotoService {
     Boolean deleteWithValidByurls(String url);
     Boolean deleteWithValid(ZEngiineeringPhoto bo);
     void write(ZEngineeringCivilBo zEngineeringCivilBo);
-    void writeImg(String id, List<ZEngineeringInfoBo> infoIdList, ZEngineeringInfoBo bo);
+    void writeImg(List<ZEngineeringInfoBo> infoIdList, ZEngineeringInfoBo bo);
 }

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

@@ -0,0 +1,56 @@
+package com.ruoyi.zdsz.service;
+
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringAirWallBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringAirWallVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * ,带气封堵施工Service接口
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+public interface IZEngineeringAirWallService {
+
+    /**
+     * 查询,带气封堵施工
+     */
+    ZEngineeringAirWallVo queryById(String id);
+
+    /**
+     * 查询,带气封堵施工列表
+     */
+    TableDataInfo<ZEngineeringAirWallVo> queryPageList(ZEngineeringAirWallBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询,带气封堵施工列表
+     */
+    List<ZEngineeringAirWallVo> queryList(ZEngineeringAirWallBo bo);
+
+    /**
+     * 新增,带气封堵施工
+     */
+    Boolean insertByBo(ZEngineeringAirWallBo bo);
+
+    /**
+     * 修改,带气封堵施工
+     */
+    Boolean updateByBo(ZEngineeringAirWallBo bo);
+
+    Boolean updateNodeByBo(ZEngineeringAirWallBo bo);
+
+    /**
+     * 校验并批量删除,带气封堵施工信息
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    ZEngineeringAirWallVo query(String id, String type);
+
+    List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringAirWallBo bo);
+}

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

@@ -309,11 +309,68 @@ public class ZEngiineeringPhotoServiceImpl implements IZEngiineeringPhotoService
 
     @Override
     @DynamicName(spel = "#bo.createTime")
-    public void writeImg(String id, List<ZEngineeringInfoBo> infoIdList,ZEngineeringInfoBo bo) {
-        Map<String, String> objInfo = baseMapper.getObjInfo(id);
+    public void writeImg(List<ZEngineeringInfoBo> infoIdList,ZEngineeringInfoBo bo) {
+        Map<String, String> objInfo = baseMapper.getObjInfo(bo.getEngInfoId());
         System.out.println("-------------节点信息-------------");
         System.out.println(objInfo);
         System.out.println("--------------------------------");
+        infoIdList.forEach(item -> {
+            item.getzEngiineeringPhotoBoList().forEach(photo -> {
+                if (StringUtils.isNotBlank(photo)) {
+                    try {
+                        // 创建最外层文件夹
+                        byte[] fileNameBytes = filePath.getBytes("UTF-8");
+                        // 使用UTF-8编码创建文件
+                        File file = new File(new String(fileNameBytes, "UTF-8"));
+                        if (!file.exists()) {
+                            file.mkdirs();
+                        }
+                       byte[] typeFileNameBytes = (file.getPath() + "/" + objInfo.get("type")).getBytes("UTF-8");
+                        // 使用UTF-8编码创建文件
+                        File typeFile = new File(new String(typeFileNameBytes, "UTF-8"));
+                        if (!typeFile.exists()) {
+                            typeFile.mkdirs();
+                        }
+                        byte[] idNameBytes = (typeFile.getPath() + "/" + objInfo.get("id")).getBytes("UTF-8");
+                        // 使用UTF-8编码创建文件
+                        File idFile = new File(new String(idNameBytes, "UTF-8"));
+                        if (!idFile.exists()) {
+                            idFile.mkdirs();
+                        }
+                        byte[] enginNameFileNameBytes = (idFile.getPath() + "/" + objInfo.get("engin_name")).getBytes("UTF-8");
+                        // 使用UTF-8编码创建文件
+                        File enginNameFile = new File(new String(enginNameFileNameBytes, "UTF-8"));
+                        if (!enginNameFile.exists()) {
+                            enginNameFile.mkdirs();
+                        }
+
+                        // 时间
+                        //                        File CreateTimeFile = new File(Type.getPath() + "/" + new SimpleDateFormat("yyyy-MM-dd").format(zEngineeringInfoBo.getCreateTime()) );
+                        byte[] CreateTimeFileNameBytes = (enginNameFile.getPath() + "/" + new SimpleDateFormat("yyyy-MM-dd").format(item.getUpdateTime())).getBytes("UTF-8");
+                        // 使用UTF-8编码创建文件
+                        File CreateTimeFile = new File(new String(CreateTimeFileNameBytes, "UTF-8"));
+                        if (!CreateTimeFile.exists()) {
+                            CreateTimeFile.mkdirs();
+                        }
+                        //                        File CreateByFile = new File(CreateTimeFile.getPath() + "/" + zEngineeringInfoBo.getConstructUser());
+                        byte[] CreateByFileNameBytes = (CreateTimeFile.getPath() + "/" + item.getConstructUser()).getBytes("UTF-8");
+                        // 使用UTF-8编码创建文件
+                        File CreateByFile = new File(new String(CreateByFileNameBytes, "UTF-8"));
+                        if (!CreateByFile.exists()) {
+                            CreateByFile.mkdirs();
+                        }
+                        obsService.download(CreateByFile.getPath(), photo.substring(photo.lastIndexOf("/")+1));
+                        System.out.println(photo.substring(photo.lastIndexOf("/")+1));
+                        System.out.println(photo);
+                        System.out.println(CreateByFile.getPath());
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
+
+
+                }
+            });
+        });
     }
 
     @Override

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

@@ -0,0 +1,354 @@
+package com.ruoyi.zdsz.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.helper.LoginHelper;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.zdsz.domain.ZEngiineeringPhoto;
+import com.ruoyi.zdsz.domain.ZEngineeringAirWall;
+import com.ruoyi.zdsz.domain.ZEngineeringIndustry;
+import com.ruoyi.zdsz.domain.bo.*;
+import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringAirWallVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryVo;
+import com.ruoyi.zdsz.mapper.ZEngineeringAirWallMapper;
+import com.ruoyi.zdsz.mapper.ZEngineeringIndustryMapper;
+import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
+import com.ruoyi.zdsz.service.IZEngineeringAirWallService;
+import com.ruoyi.zdsz.service.IZEngineeringIndustryService;
+import com.ruoyi.zdsz.service.IZEngineeringNodeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * ,带气封堵施工Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@RequiredArgsConstructor
+@Service
+public class ZEngineeringAirWallServiceImpl implements IZEngineeringAirWallService {
+
+    @Resource
+    private final ZEngineeringAirWallMapper baseMapper;
+
+    @Resource
+    private IZEngineeringNodeService izEngineeringNodeService;
+
+    @Resource
+    private IZEngineeringNodeService nodeService;
+
+    @Resource
+    private IZEngiineeringPhotoService photoService;
+
+    /**
+     * 查询,带气封堵施工
+     */
+    @Override
+    public ZEngineeringAirWallVo queryById(String id) {
+        ZEngineeringAirWallVo zEngineeringAirWallVo = baseMapper.selectVoById(id);
+
+        ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
+        zEngiineeringPhotoBo.setParentId(zEngineeringAirWallVo.getId());
+        zEngiineeringPhotoBo.setCreateTime(zEngineeringAirWallVo.getCreateTime());
+        zEngineeringAirWallVo.setPics(photoService.queryList(zEngiineeringPhotoBo));
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCivliId(id);
+        zEngineeringNodeBo.setCreateTime(zEngineeringAirWallVo.getCreateTime());
+        List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+        zEngineeringAirWallVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
+        return zEngineeringAirWallVo;
+    }
+
+    /**
+     * 查询,带气封堵施工列表
+     */
+    @Override
+    public TableDataInfo<ZEngineeringAirWallVo> queryPageList(ZEngineeringAirWallBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ZEngineeringAirWall> lqw = buildQueryWrapper(bo);
+        Page<ZEngineeringAirWallVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询,带气封堵施工列表
+     */
+    @Override
+    public List<ZEngineeringAirWallVo> queryList(ZEngineeringAirWallBo bo) {
+        LambdaQueryWrapper<ZEngineeringAirWall> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ZEngineeringAirWall> buildQueryWrapper(ZEngineeringAirWallBo bo) {
+        LambdaQueryWrapper<ZEngineeringAirWall> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngineeringAirWall::getCreateTime);
+//        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
+//        lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringIndustry::getEnginName, bo.getEnginName());
+//        lqw.like(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
+//        lqw.eq(StringUtils.isNotBlank(bo.getConstructUnit()), ZEngineeringIndustry::getConstructUnit, bo.getConstructUnit());
+//        lqw.eq(StringUtils.isNotBlank(bo.getProjectHead()), ZEngineeringIndustry::getProjectHead, bo.getProjectHead());
+//        lqw.eq(StringUtils.isNotBlank(bo.getSceneHead()), ZEngineeringIndustry::getSceneHead, bo.getSceneHead());
+//        lqw.eq(StringUtils.isNotBlank(bo.getDesignUnit()), ZEngineeringIndustry::getDesignUnit, bo.getDesignUnit());
+//        lqw.eq(StringUtils.isNotBlank(bo.getDesignHead()), ZEngineeringIndustry::getDesignHead, bo.getDesignHead());
+//        lqw.eq(StringUtils.isNotBlank(bo.getDesignPhone()), ZEngineeringIndustry::getDesignPhone, bo.getDesignPhone());
+//        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionUnit()), ZEngineeringIndustry::getSupervisionUnit, bo.getSupervisionUnit());
+//        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionHead()), ZEngineeringIndustry::getSupervisionHead, bo.getSupervisionHead());
+//        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionPhone()), ZEngineeringIndustry::getSupervisionPhone, bo.getSupervisionPhone());
+//        lqw.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringIndustry::getType, bo.getType());
+        return lqw;
+    }
+
+    /**
+     * 新增,带气封堵施工
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(ZEngineeringAirWallBo bo) {
+        ZEngineeringAirWall add = BeanUtil.toBean(bo, ZEngineeringAirWall.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+            List<ZEngiineeringPhoto> list = new ArrayList<>();
+            bo.getFiles().forEach(o -> {
+                ZEngiineeringPhoto pic = new ZEngiineeringPhoto();
+                pic.setParentId(bo.getId());
+                pic.setPicUrl(o.getUrl());
+                pic.setFileName(o.getName());
+                pic.setCreateBy(String.valueOf(LoginHelper.getUserId()));
+                pic.setCreateTime(new Date());
+                list.add(pic);
+            });
+            if (!list.isEmpty()) {
+                photoService.insertBatch(list);
+            }
+        }
+        if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
+            bo.getzEngineeringNodeBo().setCivliId(add.getId());
+            bo.getzEngineeringNodeBo().setCreateTime(new Date());
+            izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改,带气封堵施工
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(ZEngineeringAirWallBo bo) {
+        ZEngineeringAirWall update = BeanUtil.toBean(bo, ZEngineeringAirWall.class);
+        validEntityBeforeSave(update);
+        boolean flag = baseMapper.updateById(update) > 0;
+        if (flag) {
+            List<ZEngiineeringPhoto> list = new ArrayList<>();
+            // 查询数据库中已存在的文件列表
+            ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
+            zEngiineeringPhotoBo.setParentId(update.getId());
+            zEngiineeringPhotoBo.setCreateTime(bo.getCreateTime());
+            List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
+            // 插入前端传来的新文件
+            if (!ObjectUtils.isEmpty(bo.getFiles())) {
+                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(bo.getCreateTime());
+                        newPhoto.setUpdateTime(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 -> {
+                        ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                        zEngiineeringPhoto.setPicUrl(item);
+                        zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                        photoService.deleteWithValid(zEngiineeringPhoto);
+                    });
+                }
+                // 批量插入新图片
+                if (!list.isEmpty()) {
+                    photoService.insertBatch(list);
+                }
+            }
+        }
+        bo.getzEngineeringNodeBo().setCivliId(bo.getId());
+//        bo.getzEngineeringNodeBo().setType(bo.getType());
+        bo.getzEngineeringNodeBo().setCreateTime(bo.getCreateTime());
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCivliId(update.getId());
+//        zEngineeringNodeBo.setType(bo.getType());
+        zEngineeringNodeBo.setType(bo.getzEngineeringNodeBo().getType()); // zEngineeringNodeBo.setType(bo.getzEngineeringNodeBo().getType());
+        zEngineeringNodeBo.setCreateTime(baseMapper.selectVoById(bo.getId()).getCreateTime());
+        ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
+        if (!ObjectUtils.isEmpty(query)) {
+            bo.getzEngineeringNodeBo().setId(query.getId());
+        }
+        bo.getzEngineeringNodeBo().setCreateTime(zEngineeringNodeBo.getCreateTime());
+        izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
+        System.out.println("izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());");
+        return flag;
+    }
+
+    /**
+     * 修改,带气封堵施工
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateNodeByBo(ZEngineeringAirWallBo bo) {
+        ZEngineeringAirWall update = BeanUtil.toBean(bo, ZEngineeringAirWall.class);
+        boolean flag = baseMapper.updateById(update) > 0;
+        if (flag) {
+            if (!ObjectUtils.isEmpty(bo.getFiles())) {
+                List<ZEngiineeringPhoto> list = new ArrayList<>();
+                // 查询数据库中已存在的文件列表
+                ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
+                zEngiineeringPhotoBo.setParentId(update.getId());
+                List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).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.getUsername()));
+                        newPhoto.setCreateTime(bo.getCreateTime());
+                        newPhoto.setUpdateTime(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 -> {
+                        ZEngiineeringPhoto zEngiineeringPhoto = new ZEngiineeringPhoto();
+                        zEngiineeringPhoto.setPicUrl(item);
+                        zEngiineeringPhoto.setCreateTime(bo.getCreateTime());
+                        photoService.deleteWithValid(zEngiineeringPhoto);
+                    });
+                }
+                // 批量插入新图片
+                if (!list.isEmpty()) {
+                    photoService.insertBatch(list);
+                }
+            }
+        }
+        if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())){
+            List<ZEngineeringInfoBo> engineeringInfoBoList1 = bo.getzEngineeringNodeBo().getzEngineeringInfoBoList();
+            if (engineeringInfoBoList1 != null && !engineeringInfoBoList1.isEmpty()) {
+                nodeService.updateMuch(bo.getzEngineeringNodeBo());
+            }
+        }
+        //        bo.getzEngineeringNodeBoList().stream().forEach(item->{
+        //            item.setCivliId(bo.getId());
+        //            item.setCreateTime(bo.getCreateTime());
+        //            item.setType(bo.getType());
+        //            izEngineeringNodeService.updateMuch(item);
+        //        });
+        return flag;
+    }
+
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ZEngineeringAirWall entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除,带气封堵施工
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+
+        ids.forEach(item -> {
+            // 查询数据库中已存在的文件列表
+            ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
+            zEngiineeringPhotoBo.setParentId(item);
+            // 将查询出的url放入existingPhotos
+            List<String> existingPhotos = photoService.queryList(zEngiineeringPhotoBo).stream().map(ZEngiineeringPhotoVo::getPicUrl).collect(Collectors.toList());
+            // 若存在 则进行删除
+            if (!existingPhotos.isEmpty()) {
+                existingPhotos.forEach(i -> {
+                    photoService.deleteWithValidByurls(i);
+                });
+            }
+            // 初始化工程节点对象
+            ZEngineeringAirWallVo vo = baseMapper.selectVoById(item);
+            ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+            zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
+            zEngineeringNodeBo.setCivliId(vo.getId());
+            //  查询数据库中已存在的工程节点
+            List<ZEngineeringNodeBo> zEngineeringNodeBos = nodeService.queryListDetails(zEngineeringNodeBo);
+            // 若存在 则进行删除
+            if (!zEngineeringNodeBos.isEmpty()) {
+                zEngineeringNodeBos.forEach(ite -> nodeService.delete(ite));
+            }
+        });
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    @Override
+    public ZEngineeringAirWallVo query(String id, String type) {
+        ZEngineeringAirWallVo zEngineeringAirWallVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCreateTime(zEngineeringAirWallVo.getCreateTime());
+        zEngineeringNodeBo.setCivliId(zEngineeringAirWallVo.getId());
+        System.out.println("type===" + type);
+        zEngineeringNodeBo.setType(type);
+//        zEngineeringNodeBo.setType("trench_construction");
+        zEngineeringAirWallVo.setZEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
+        return zEngineeringAirWallVo;
+    }
+
+    @Override
+    public List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringAirWallBo bo) {
+        LambdaQueryWrapper<ZEngineeringAirWall> zEngineeringAirWallBoLambdaQueryWrapper = buildListByType(bo);
+        zEngineeringAirWallBoLambdaQueryWrapper.orderByDesc(ZEngineeringAirWall::getCreateTime);
+//        List<ZEngineeringAirWall> zEngineeringAirWalVos = baseMapper.selectList(zEngineeringAirWallBoLambdaQueryWrapper);
+//        List<ZEngineeringIndustryTypeVo> zEngineeringAirWalTypeVos = zEngineeringAirWalVos.stream().map(ZEngineeringIndustryTypeVo::new).collect(Collectors.toList());
+//        return zEngineeringAirWalTypeVos;
+        return new ArrayList<ZEngineeringIndustryTypeVo>();
+    }
+
+    private LambdaQueryWrapper<ZEngineeringAirWall> buildListByType(ZEngineeringAirWallBo bo) {
+
+        LambdaQueryWrapper<ZEngineeringAirWall> queryWrapper = new LambdaQueryWrapper<ZEngineeringAirWall>();
+        queryWrapper.orderByDesc(ZEngineeringAirWall::getCreateTime);
+//        queryWrapper.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringIndustry::getEnginType, bo.getEnginType());
+//        queryWrapper.eq(StringUtils.isNotBlank(bo.getType()), ZEngineeringIndustry::getType, bo.getType());
+//        if (!"null".equals(bo.getEnginClassification())) {
+//            queryWrapper.like(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringIndustry::getEnginClassification, bo.getEnginClassification());
+//        }
+        if (!"null".equals(bo.getEnginName())) {
+            queryWrapper.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringAirWall::getEnginName, bo.getEnginName());
+        }
+
+        return queryWrapper;
+    }
+
+
+}

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

@@ -1059,7 +1059,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
                 MonthTableNameHandler.setData(format.format(item.getCreateTime()));
                 zEngineeringInfoMapper.update(lqw);
                 MonthTableNameHandler.removeData();
-                izEngiineeringPhotoService.writeImg(zEngineeringReviewBo.getEngInfoId(),infoIdList.getInfoIdList(), item);
+                izEngiineeringPhotoService.writeImg(infoIdList.getInfoIdList(), item);
             });
 
             izEngineeringReviewService.insert(zEngineeringReviewBo);

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

@@ -37,7 +37,16 @@
     </select>
 
     <select id="getObjInfo" resultType="java.util.Map">
-        SELECT * FROM `z_engineering_node` WHERE id = #{nodeId}
+        SELECT
+            IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-',zein.engin_name),zed.engin_name),zei.engin_name),zepj.engin_name) AS engin_name,
+            IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-',zein.id),zed.id),zei.id),zepj.id) AS id,
+            IF(ISNULL(zepj.engin_name),IF(ISNULL(zei.engin_name),IF(ISNULL(zed.engin_name),IF(ISNULL(zein.engin_name),'-',IF(zein.type = '1','工业工程','市政工程')),'危险工程'),'基建工程'),'顶管工程') AS type
+        FROM z_engineering_node_2024_05 ze
+                 LEFT JOIN z_engineering_pipe_jacking zepj ON zepj.id = ze.civli_id
+                 LEFT JOIN z_engineering_infrastructure zei ON zei.id = ze.civli_id
+                 LEFT JOIN z_engineering_dangerous zed ON zed.id = ze.civli_id
+                 LEFT JOIN z_engineering_industry zein ON zein.id = ze.civli_id
+        WHERE ze.id = #{nodeId}
     </select>
 
 </mapper>