Kaynağa Gözat

新增开栓施工

wangzhe 1 yıl önce
ebeveyn
işleme
c50c44217f

+ 140 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZEngineeringGasOpeningController.java

@@ -0,0 +1,140 @@
+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.ZEngineeringGasOpeningBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringGasOpeningVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
+import com.ruoyi.zdsz.service.IZEngineeringGasOpeningService;
+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/engineeringGasOpening")
+public class ZEngineeringGasOpeningController extends BaseController {
+
+    private final IZEngineeringGasOpeningService iZEngineeringGasOpeningService;
+
+    /**
+     * 查询开栓施工列表
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngineeringGasOpeningVo> list(ZEngineeringGasOpeningBo bo, PageQuery pageQuery, String enginType) {
+//        bo.setType(type);
+        bo.setEnginType(enginType);
+        System.out.println("enginType==="+enginType);
+        return iZEngineeringGasOpeningService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出开栓施工列表
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:export")
+    @Log(title = "开栓施工", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngineeringGasOpeningBo bo, HttpServletResponse response) {
+        List<ZEngineeringGasOpeningVo> list = iZEngineeringGasOpeningService.queryList(bo);
+        ExcelUtil.exportExcel(list, "带气封堵施工", ZEngineeringGasOpeningVo.class, response);
+    }
+
+    /**
+     * 获取开栓施工详细信息
+     *
+     * @param id 主键
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringGasOpeningVo> getInfo(@NotNull(message = "主键不能为空")@PathVariable String id) {
+        return R.ok(iZEngineeringGasOpeningService.queryById(id));
+    }
+
+    /**
+     * 新增开栓施工
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:add")
+    @Log(title = "开栓施工", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringGasOpeningBo bo) {
+        return toAjax(iZEngineeringGasOpeningService.insertByBo(bo));
+    }
+
+    /**
+     * 修改开栓施工
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:edit")
+    @Log(title = "开栓施工", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringGasOpeningBo bo) {
+        return toAjax(iZEngineeringGasOpeningService.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(iZEngineeringGasOpeningService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 开栓施工历史
+     *
+     */
+//    @SaCheckPermission("zdsz:engineeringIndustry:query")
+    @GetMapping("/{id}/{type}")
+    public R<ZEngineeringGasOpeningVo> query(@NotNull(message = "主键不能为空") @PathVariable String id, @PathVariable String type) {
+//        return R.ok(iZEngineeringGasOpeningService.query(id, type));
+        return R.ok(iZEngineeringGasOpeningService.query(id, "带气封堵施工"));
+    }
+
+    /**
+     * 开栓施工根据工程类型查询工程名称
+     */
+    @GetMapping("/queryNameByType")
+//    @SaCheckPermission("zdsz:engineeringIndustry:type")
+    public R<List<ZEngineeringIndustryTypeVo>> queryNameByType(ZEngineeringGasOpeningBo bo) {
+        return R.ok(iZEngineeringGasOpeningService.queryNameByType(bo));
+    }
+
+    /**
+     * 开栓施工修改工程
+     */
+    @PutMapping("/updateNodeByBo")
+    @Log(title = "开栓施工", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+//    @SaCheckPermission("zdsz:engineeringIndustry:removeNode")
+    public R<Void> updateNodeByBo(@Validated(EditGroup.class) @RequestBody ZEngineeringGasOpeningBo bo) {
+        return toAjax(iZEngineeringGasOpeningService.updateNodeByBo(bo));
+    }
+
+}

+ 182 - 0
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/ZEngineeringGasOpening.java

@@ -0,0 +1,182 @@
+package com.ruoyi.zdsz.domain;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+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 com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 开栓施工对象 z_engineering_gas_opening
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("z_engineering_gas_opening")
+public class ZEngineeringGasOpening extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private String id;
+    /**
+     * 工程类型
+     */
+    private String enginType;
+
+    /**
+     * 行政区
+     */
+    private String district;
+    /**
+     * 小区id
+     */
+    private String areaId;
+    /**
+     * 楼栋id
+     */
+    private String buildingId;
+    /**
+     * 单元id
+     */
+    private String unitId;
+    /**
+     * 房间id
+     */
+    private String houseId;
+
+    /**
+     * 立杠是否刷涂防腐漆
+     */
+    private String isAntiCorrosionPaint;
+    /**
+     * 是否有立杠卡子
+     */
+    private String isVerticalBarClamp;
+    /**
+     * 立杠气密测试
+     */
+    private String verticalBarTest;
+    /**
+     * 单户气密测试
+     */
+    private String householdTest;
+    /**
+     * 表号
+     */
+    private String gasMeterNumber;
+    /**
+     * 表字
+     */
+    private String gasMeterCount;
+    /**
+     * 品牌
+     */
+    private String gasMeterBrand;
+    /**
+     * 进气方向(左、右表)
+     */
+    private String gasMeterDirection;
+    /**
+     * 型号
+     */
+    private String gasMeterType;
+    /**
+     * 管表后管是否有卡子固定
+     */
+    private String isRearPipeClamp;
+    /**
+     * 是否阀管改造(全改、单改阀、单改管)
+     */
+    private String gasChangeType;
+    /**
+     * 是否使用防风圈
+     */
+    private String isWindproofCircle;
+
+//    /**
+//     * 建筑单位
+//     */
+//    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;
+
+
+
+}

+ 180 - 0
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZEngineeringGasOpeningBo.java

@@ -0,0 +1,180 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
+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 ZEngineeringGasOpeningBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 工程名称
+     */
+    private String enginName;
+
+    /**
+     * 工程类型
+     */
+    private String enginType;
+
+    /**
+     * 行政区
+     */
+    private String district;
+    /**
+     * 小区id
+     */
+    private String areaId;
+    /**
+     * 楼栋id
+     */
+    private String buildingId;
+    /**
+     * 单元id
+     */
+    private String unitId;
+    /**
+     * 房间id
+     */
+    private String houseId;
+
+    /**
+     * 立杠是否刷涂防腐漆
+     */
+    @ExcelProperty(value = "立杠是否刷涂防腐漆")
+    private String isAntiCorrosionPaint;
+    /**
+     * 是否有立杠卡子
+     */
+    @ExcelProperty(value = "是否有立杠卡子")
+    private String isVerticalBarClamp;
+    /**
+     * 立杠气密测试
+     */
+    @ExcelProperty(value = "立杠气密测试")
+    private String verticalBarTest;
+    /**
+     * 单户气密测试
+     */
+    @ExcelProperty(value = "单户气密测试")
+    private String householdTest;
+    /**
+     * 表号
+     */
+    @ExcelProperty(value = "表号")
+    private String gasMeterNumber;
+    /**
+     * 表字
+     */
+    @ExcelProperty(value = "表字")
+    private String gasMeterCount;
+    /**
+     * 品牌
+     */
+    @ExcelProperty(value = "品牌")
+    private String gasMeterBrand;
+    /**
+     * 进气方向(左、右表)
+     */
+    @ExcelProperty(value = "进气方向")
+    private String gasMeterDirection;
+    /**
+     * 型号
+     */
+    @ExcelProperty(value = "型号")
+    private String gasMeterType;
+    /**
+     * 管表后管是否有卡子固定
+     */
+    @ExcelProperty(value = "管表后管是否有卡子固定")
+    private String isRearPipeClamp;
+    /**
+     * 是否阀管改造(全改、单改阀、单改管)
+     */
+    @ExcelProperty(value = "是否阀管改造")
+    private String gasChangeType;
+    /**
+     * 是否使用防风圈
+     */
+    @ExcelProperty(value = "是否使用防风圈")
+    private String isWindproofCircle;
+
+    /**
+     * 燃气立杠
+     */
+    private List<ZEngiineeringPhotoVo> gasCylinderPic;
+    /**
+     * 气密测试
+     */
+    private List<ZEngiineeringPhotoVo> pressureTestPic;
+    /**
+     * 燃气表
+     */
+    private List<ZEngiineeringPhotoVo> gasMeterPic;
+    /**
+     * 表后
+     */
+    private List<ZEngiineeringPhotoVo> rearPipePic;
+    /**
+     * 灶前阀门
+     */
+    private List<ZEngiineeringPhotoVo> gasChangePic;
+    /**
+     * 软管
+     */
+    private List<ZEngiineeringPhotoVo> softPipePic;
+    /**
+     * 灶具
+     */
+    private List<ZEngiineeringPhotoVo> windproofCirclePic;
+    /**
+     * 用气环境
+     */
+    private List<ZEngiineeringPhotoVo> gasEnvironmentPic;
+    /**
+     * 回执单
+     */
+    private List<ZEngiineeringPhotoVo> receiptFormPic;
+
+    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;
+    }
+}

+ 245 - 0
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringGasOpeningVo.java

@@ -0,0 +1,245 @@
+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_gas_opening
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringGasOpeningVo extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private String id;
+
+    /**
+     * 工程类型
+     */
+    @ExcelProperty(value = "工程类型")
+    private String enginType;
+
+    /**
+     * 行政区
+     */
+    private String district;
+    /**
+     * 小区id
+     */
+    private String areaId;
+    /**
+     * 楼栋id
+     */
+    private String buildingId;
+    /**
+     * 单元id
+     */
+    private String unitId;
+    /**
+     * 房间id
+     */
+    private String houseId;
+
+    /**
+     * 立杠是否刷涂防腐漆
+     */
+    @ExcelProperty(value = "立杠是否刷涂防腐漆")
+    private String isAntiCorrosionPaint;
+    /**
+     * 是否有立杠卡子
+     */
+    @ExcelProperty(value = "是否有立杠卡子")
+    private String isVerticalBarClamp;
+    /**
+     * 立杠气密测试
+     */
+    @ExcelProperty(value = "立杠气密测试")
+    private String verticalBarTest;
+    /**
+     * 单户气密测试
+     */
+    @ExcelProperty(value = "单户气密测试")
+    private String householdTest;
+    /**
+     * 表号
+     */
+    @ExcelProperty(value = "表号")
+    private String gasMeterNumber;
+    /**
+     * 表字
+     */
+    @ExcelProperty(value = "表字")
+    private String gasMeterCount;
+    /**
+     * 品牌
+     */
+    @ExcelProperty(value = "品牌")
+    private String gasMeterBrand;
+    /**
+     * 进气方向(左、右表)
+     */
+    @ExcelProperty(value = "进气方向")
+    private String gasMeterDirection;
+    /**
+     * 型号
+     */
+    @ExcelProperty(value = "型号")
+    private String gasMeterType;
+    /**
+     * 管表后管是否有卡子固定
+     */
+    @ExcelProperty(value = "管表后管是否有卡子固定")
+    private String isRearPipeClamp;
+    /**
+     * 是否阀管改造(全改、单改阀、单改管)
+     */
+    @ExcelProperty(value = "是否阀管改造")
+    private String gasChangeType;
+    /**
+     * 是否使用防风圈
+     */
+    @ExcelProperty(value = "是否使用防风圈")
+    private String isWindproofCircle;
+
+    /**
+     * 燃气立杠
+     */
+    private List<ZEngiineeringPhotoVo> gasCylinderPic;
+    /**
+     * 气密测试
+     */
+    private List<ZEngiineeringPhotoVo> pressureTestPic;
+    /**
+     * 燃气表
+     */
+    private List<ZEngiineeringPhotoVo> gasMeterPic;
+    /**
+     * 表后
+     */
+    private List<ZEngiineeringPhotoVo> rearPipePic;
+    /**
+     * 灶前阀门
+     */
+    private List<ZEngiineeringPhotoVo> gasChangePic;
+    /**
+     * 软管
+     */
+    private List<ZEngiineeringPhotoVo> softPipePic;
+    /**
+     * 灶具
+     */
+    private List<ZEngiineeringPhotoVo> windproofCirclePic;
+    /**
+     * 用气环境
+     */
+    private List<ZEngiineeringPhotoVo> gasEnvironmentPic;
+    /**
+     * 回执单
+     */
+    private List<ZEngiineeringPhotoVo> receiptFormPic;
+
+
+//
+//    /**
+//     * 建筑单位
+//     */
+//    @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;
+
+}

+ 15 - 0
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/mapper/ZEngineeringGasOpeningMapper.java

@@ -0,0 +1,15 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+import com.ruoyi.zdsz.domain.ZEngineeringGasOpening;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringGasOpeningVo;
+
+/**
+ * 开栓施工Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+public interface ZEngineeringGasOpeningMapper extends BaseMapperPlus<ZEngineeringGasOpeningMapper, ZEngineeringGasOpening, ZEngineeringGasOpeningVo> {
+
+}

+ 55 - 0
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZEngineeringGasOpeningService.java

@@ -0,0 +1,55 @@
+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.ZEngineeringGasOpeningBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringGasOpeningVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 开栓施工Service接口
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+public interface IZEngineeringGasOpeningService {
+
+    /**
+     * 查询开栓施工
+     */
+    ZEngineeringGasOpeningVo queryById(String id);
+
+    /**
+     * 查询开栓施工列表
+     */
+    TableDataInfo<ZEngineeringGasOpeningVo> queryPageList(ZEngineeringGasOpeningBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询开栓施工列表
+     */
+    List<ZEngineeringGasOpeningVo> queryList(ZEngineeringGasOpeningBo bo);
+
+    /**
+     * 新增开栓施工
+     */
+    Boolean insertByBo(ZEngineeringGasOpeningBo bo);
+
+    /**
+     * 修改开栓施工
+     */
+    Boolean updateByBo(ZEngineeringGasOpeningBo bo);
+
+    Boolean updateNodeByBo(ZEngineeringGasOpeningBo bo);
+
+    /**
+     * 校验并批量删除开栓施工信息
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    ZEngineeringGasOpeningVo query(String id, String type);
+
+    List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringGasOpeningBo bo);
+}

+ 354 - 0
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringGasOpeningServiceImpl.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.ZEngineeringGasOpening;
+import com.ruoyi.zdsz.domain.bo.*;
+import com.ruoyi.zdsz.domain.vo.ZEngiineeringPhotoVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringGasOpeningVo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringIndustryTypeVo;
+import com.ruoyi.zdsz.mapper.ZEngineeringGasOpeningMapper;
+import com.ruoyi.zdsz.service.IZEngiineeringPhotoService;
+import com.ruoyi.zdsz.service.IZEngineeringGasOpeningService;
+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 ZEngineeringGasOpeningServiceImpl implements IZEngineeringGasOpeningService {
+
+    @Resource
+    private final ZEngineeringGasOpeningMapper baseMapper;
+
+    @Resource
+    private IZEngineeringNodeService izEngineeringNodeService;
+
+    @Resource
+    private IZEngineeringNodeService nodeService;
+
+    @Resource
+    private IZEngiineeringPhotoService photoService;
+
+    /**
+     * 查询开栓施工
+     */
+    @Override
+    public ZEngineeringGasOpeningVo queryById(String id) {
+        ZEngineeringGasOpeningVo zEngineeringGasOpeningVo = baseMapper.selectVoById(id);
+
+        ZEngiineeringPhotoBo zEngiineeringPhotoBo = new ZEngiineeringPhotoBo();
+        zEngiineeringPhotoBo.setParentId(zEngineeringGasOpeningVo.getId());
+        zEngiineeringPhotoBo.setCreateTime(zEngineeringGasOpeningVo.getCreateTime());
+        zEngineeringGasOpeningVo.setPics(photoService.queryList(zEngiineeringPhotoBo));
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCivliId(id);
+        zEngineeringNodeBo.setCreateTime(zEngineeringGasOpeningVo.getCreateTime());
+        List<ZEngineeringNodeBo> zEngineeringNodeBos = izEngineeringNodeService.queryListDetails(zEngineeringNodeBo);
+        zEngineeringGasOpeningVo.setZEngineeringNodeBoList(zEngineeringNodeBos);
+        return zEngineeringGasOpeningVo;
+    }
+
+    /**
+     * 查询开栓施工列表
+     */
+    @Override
+    public TableDataInfo<ZEngineeringGasOpeningVo> queryPageList(ZEngineeringGasOpeningBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ZEngineeringGasOpening> lqw = buildQueryWrapper(bo);
+        lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringGasOpening::getEnginName, bo.getEnginName());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringGasOpening::getEnginType, bo.getEnginType());
+        Page<ZEngineeringGasOpeningVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询开栓施工列表
+     */
+    @Override
+    public List<ZEngineeringGasOpeningVo> queryList(ZEngineeringGasOpeningBo bo) {
+        LambdaQueryWrapper<ZEngineeringGasOpening> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ZEngineeringGasOpening> buildQueryWrapper(ZEngineeringGasOpeningBo bo) {
+        LambdaQueryWrapper<ZEngineeringGasOpening> lqw = Wrappers.lambdaQuery();
+        lqw.orderByDesc(ZEngineeringGasOpening::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(ZEngineeringGasOpeningBo bo) {
+        ZEngineeringGasOpening add = BeanUtil.toBean(bo, ZEngineeringGasOpening.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(ZEngineeringGasOpeningBo bo) {
+        ZEngineeringGasOpening update = BeanUtil.toBean(bo, ZEngineeringGasOpening.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.setType("带气封堵施工"); // 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().setType("带气封堵施工");
+        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(ZEngineeringGasOpeningBo bo) {
+        ZEngineeringGasOpening update = BeanUtil.toBean(bo, ZEngineeringGasOpening.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(ZEngineeringGasOpening 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);
+                });
+            }
+            // 初始化工程节点对象
+            ZEngineeringGasOpeningVo 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 ZEngineeringGasOpeningVo query(String id, String type) {
+        ZEngineeringGasOpeningVo zEngineeringGasOpeningVo = baseMapper.selectVoById(id);
+        ZEngineeringNodeBo zEngineeringNodeBo = new ZEngineeringNodeBo();
+        zEngineeringNodeBo.setCreateTime(zEngineeringGasOpeningVo.getCreateTime());
+        zEngineeringNodeBo.setCivliId(zEngineeringGasOpeningVo.getId());
+        System.out.println("type===" + type);
+        zEngineeringNodeBo.setType(type);
+//        zEngineeringNodeBo.setType("trench_construction");
+        zEngineeringGasOpeningVo.setZEngineeringNodeBo(izEngineeringNodeService.query(zEngineeringNodeBo));
+        return zEngineeringGasOpeningVo;
+    }
+
+    @Override
+    public List<ZEngineeringIndustryTypeVo> queryNameByType(ZEngineeringGasOpeningBo bo) {
+        LambdaQueryWrapper<ZEngineeringGasOpening> zEngineeringGasOpeningBoLambdaQueryWrapper = buildListByType(bo);
+        zEngineeringGasOpeningBoLambdaQueryWrapper.orderByDesc(ZEngineeringGasOpening::getCreateTime);
+//        List<ZEngineeringGasOpening> zEngineeringAirWalVos = baseMapper.selectList(zEngineeringGasOpeningBoLambdaQueryWrapper);
+//        List<ZEngineeringIndustryTypeVo> zEngineeringAirWalTypeVos = zEngineeringAirWalVos.stream().map(ZEngineeringIndustryTypeVo::new).collect(Collectors.toList());
+//        return zEngineeringAirWalTypeVos;
+        return new ArrayList<ZEngineeringIndustryTypeVo>();
+    }
+
+    private LambdaQueryWrapper<ZEngineeringGasOpening> buildListByType(ZEngineeringGasOpeningBo bo) {
+
+        LambdaQueryWrapper<ZEngineeringGasOpening> queryWrapper = new LambdaQueryWrapper<ZEngineeringGasOpening>();
+        queryWrapper.orderByDesc(ZEngineeringGasOpening::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()), ZEngineeringGasOpening::getEnginName, bo.getEnginName());
+        }
+
+        return queryWrapper;
+    }
+
+
+}