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

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

@@ -0,0 +1,110 @@
+package com.ruoyi.web.controller.zdsz;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+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.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerousVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringDangerousBo;
+import com.ruoyi.zdsz.service.IZEngineeringDangerousService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 危险工程
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/zdsz/engineeringDangerous")
+public class ZEngineeringDangerousController extends BaseController {
+
+    private final IZEngineeringDangerousService iZEngineeringDangerousService;
+
+    /**
+     * 查询危险工程列表
+     */
+    @SaCheckPermission("system:engineeringDangerous:list")
+    @GetMapping("/list")
+    public TableDataInfo<ZEngineeringDangerousVo> list(ZEngineeringDangerousBo bo, PageQuery pageQuery) {
+        return iZEngineeringDangerousService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出危险工程列表
+     */
+    @SaCheckPermission("system:engineeringDangerous:export")
+    @Log(title = "危险工程", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ZEngineeringDangerousBo bo, HttpServletResponse response) {
+        List<ZEngineeringDangerousVo> list = iZEngineeringDangerousService.queryList(bo);
+        ExcelUtil.exportExcel(list, "危险工程", ZEngineeringDangerousVo.class, response);
+    }
+
+    /**
+     * 获取危险工程详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:engineeringDangerous:query")
+    @GetMapping("/{id}")
+    public R<ZEngineeringDangerousVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable String id) {
+        return R.ok(iZEngineeringDangerousService.queryById(id));
+    }
+
+    /**
+     * 新增危险工程
+     */
+    @SaCheckPermission("system:engineeringDangerous:add")
+    @Log(title = "危险工程", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ZEngineeringDangerousBo bo) {
+        bo.setCreateTime(new Date());
+        return toAjax(iZEngineeringDangerousService.insert(bo));
+    }
+
+    /**
+     * 修改危险工程
+     */
+    @SaCheckPermission("system:engineeringDangerous:edit")
+    @Log(title = "危险工程", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ZEngineeringDangerousBo bo) {
+        return toAjax(iZEngineeringDangerousService.updateByBo(bo));
+    }
+
+    /**
+     * 删除危险工程
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:engineeringDangerous:remove")
+    @Log(title = "危险工程", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable String[] ids) {
+        return toAjax(iZEngineeringDangerousService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -0,0 +1,179 @@
+package com.ruoyi.zdsz.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 危险工程对象 z_engineering_dangerous
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("z_engineering_dangerous")
+public class ZEngineeringDangerous extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private String id;
+    /**
+     * 作业基本信息
+     */
+    private String basicInformation;
+    /**
+     * 工程名称
+     */
+    private String enginName;
+    /**
+     * 工程地点
+     */
+    private String enginAddre;
+    /**
+     * 工程时间
+     */
+    private Date enginTime;
+    /**
+     * 管径
+     */
+    private String pipeDiameter;
+    /**
+     * 管材
+     */
+    private String tubularProduct;
+    /**
+     * 是否存在套管
+     */
+    private String casingPresent;
+    /**
+     * 管道压力
+     */
+    private String pipePressure;
+    /**
+     * 气源方向
+     */
+    private String gasSourceDirection;
+    /**
+     * 作业位置
+     */
+    private String taskPosition;
+    /**
+     * 与作业相关阀门位置
+     */
+    private String valvePosition;
+    /**
+     * 压力报告
+     */
+    private String stressReport;
+    /**
+     * 监理旁站记录
+     */
+    private String supervisionRecord;
+    /**
+     * 工作联系单
+     */
+    private String workContactForm;
+    /**
+     * 巡线确认单
+     */
+    private String linePatrolConfirmationForm;
+    /**
+     * 危险作业坑大小(长)
+     */
+    private Long hazardousWorkPitsLong;
+    /**
+     * 危险作业坑大小(宽)
+     */
+    private Long hazardousWorkPitsWide;
+    /**
+     * 危险作业坑大小(深)
+     */
+    private Long hazardousWorkPitsDeep;
+    /**
+     * 是否需要支护
+     */
+    private String needSupport;
+    /**
+     * 作业坑内其他管道情况
+     */
+    private String otherPipelineConditionsWorkPit;
+    /**
+     * 现场负责人
+     */
+    private String siteHead;
+    /**
+     * 现场负责人电话
+     */
+    private String siteHeadPhone;
+    /**
+     * 作业人员信息
+     */
+    private String operatorInformation;
+    /**
+     * 检口
+     */
+    private String inspectionPort;
+    /**
+     * 管道刷油
+     */
+    private String pipelinePainting;
+    /**
+     * 管道支护
+     */
+    private String pipelineSupport;
+    /**
+     * 管道防腐
+     */
+    private String pipelineCorrosionProtection;
+    /**
+     * 砌筑阀门井
+     */
+    private String masonryValveWell;
+    /**
+     * 保护井
+     */
+    private String protectionWell;
+    /**
+     * 管件保护井砌筑
+     */
+    private String pipeProtectionWelMasonry;
+    /**
+     * 回填
+     */
+    private String backfill;
+    /**
+     * 夯实
+     */
+    private String tamp;
+    /**
+     * 平整场地
+     */
+    private String levelingTheSite;
+    /**
+     * 乐观锁
+     */
+    @Version
+    private String version;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 删除标识
+     */
+    @TableLogic
+    private String delFlag;
+
+}

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

@@ -0,0 +1,245 @@
+package com.ruoyi.zdsz.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 危险工程业务对象 z_engineering_dangerous
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ZEngineeringDangerousBo extends BaseEntity {
+
+    /**
+     *
+     */
+    @NotBlank(message = "不能为空", groups = { EditGroup.class })
+    private String id;
+
+    /**
+     * 作业基本信息
+     */
+    @NotBlank(message = "作业基本信息不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String basicInformation;
+
+    /**
+     * 工程名称
+     */
+    @NotBlank(message = "工程名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginName;
+
+    /**
+     * 工程地点
+     */
+    @NotBlank(message = "工程地点不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enginAddre;
+
+    /**
+     * 工程时间
+     */
+    @NotNull(message = "工程时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date enginTime;
+
+    /**
+     * 管径
+     */
+    @NotBlank(message = "管径不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pipeDiameter;
+
+    /**
+     * 管材
+     */
+    @NotBlank(message = "管材不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tubularProduct;
+
+    /**
+     * 是否存在套管
+     */
+    @NotBlank(message = "是否存在套管不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String casingPresent;
+
+    /**
+     * 管道压力
+     */
+    @NotBlank(message = "管道压力不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pipePressure;
+
+    /**
+     * 气源方向
+     */
+    @NotBlank(message = "气源方向不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String gasSourceDirection;
+
+    /**
+     * 作业位置
+     */
+    @NotBlank(message = "作业位置不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String taskPosition;
+
+    /**
+     * 与作业相关阀门位置
+     */
+    @NotBlank(message = "与作业相关阀门位置不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String valvePosition;
+
+    /**
+     * 压力报告
+     */
+    @NotBlank(message = "压力报告不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String stressReport;
+
+    /**
+     * 监理旁站记录
+     */
+    @NotBlank(message = "监理旁站记录不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String supervisionRecord;
+
+    /**
+     * 工作联系单
+     */
+    @NotBlank(message = "工作联系单不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String workContactForm;
+
+    /**
+     * 巡线确认单
+     */
+    @NotBlank(message = "巡线确认单不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String linePatrolConfirmationForm;
+
+    /**
+     * 危险作业坑大小(长)
+     */
+    @NotNull(message = "危险作业坑大小(长)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long hazardousWorkPitsLong;
+
+    /**
+     * 危险作业坑大小(宽)
+     */
+    @NotNull(message = "危险作业坑大小(宽)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long hazardousWorkPitsWide;
+
+    /**
+     * 危险作业坑大小(深)
+     */
+    @NotNull(message = "危险作业坑大小(深)不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long hazardousWorkPitsDeep;
+
+    /**
+     * 是否需要支护
+     */
+    @NotBlank(message = "是否需要支护不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String needSupport;
+
+    /**
+     * 作业坑内其他管道情况
+     */
+    @NotBlank(message = "作业坑内其他管道情况不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String otherPipelineConditionsWorkPit;
+
+    /**
+     * 现场负责人
+     */
+    @NotBlank(message = "现场负责人不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String siteHead;
+
+    /**
+     * 现场负责人电话
+     */
+    @NotBlank(message = "现场负责人电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String siteHeadPhone;
+
+    /**
+     * 作业人员信息
+     */
+    @NotBlank(message = "作业人员信息不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String operatorInformation;
+
+    /**
+     * 检口
+     */
+    @NotBlank(message = "检口不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String inspectionPort;
+
+    /**
+     * 管道刷油
+     */
+    @NotBlank(message = "管道刷油不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pipelinePainting;
+
+    /**
+     * 管道支护
+     */
+    @NotBlank(message = "管道支护不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pipelineSupport;
+
+    /**
+     * 管道防腐
+     */
+    @NotBlank(message = "管道防腐不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pipelineCorrosionProtection;
+
+    /**
+     * 砌筑阀门井
+     */
+    @NotBlank(message = "砌筑阀门井不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String masonryValveWell;
+
+    /**
+     * 保护井
+     */
+    @NotBlank(message = "保护井不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String protectionWell;
+
+    /**
+     * 管件保护井砌筑
+     */
+    @NotBlank(message = "管件保护井砌筑不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pipeProtectionWelMasonry;
+
+    /**
+     * 回填
+     */
+    @NotBlank(message = "回填不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String backfill;
+
+    /**
+     * 夯实
+     */
+    @NotBlank(message = "夯实不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String tamp;
+
+    /**
+     * 平整场地
+     */
+    @NotBlank(message = "平整场地不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String levelingTheSite;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+    private ZEngineeringNodeBo zEngineeringNodeBo;
+
+    public ZEngineeringNodeBo getzEngineeringNodeBo() {
+        return zEngineeringNodeBo;
+    }
+
+    public void setzEngineeringNodeBo(ZEngineeringNodeBo zEngineeringNodeBo) {
+        this.zEngineeringNodeBo = zEngineeringNodeBo;
+    }
+}

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

@@ -0,0 +1,237 @@
+package com.ruoyi.zdsz.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+import java.io.Serializable;
+
+/**
+ * 危险工程视图对象 z_engineering_dangerous
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class ZEngineeringDangerousVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private String id;
+
+    /**
+     * 作业基本信息
+     */
+    @ExcelProperty(value = "作业基本信息")
+    private String basicInformation;
+
+    /**
+     * 工程名称
+     */
+    @ExcelProperty(value = "工程名称")
+    private String enginName;
+
+    /**
+     * 工程地点
+     */
+    @ExcelProperty(value = "工程地点")
+    private String enginAddre;
+
+    /**
+     * 工程时间
+     */
+    @ExcelProperty(value = "工程时间")
+    private Date enginTime;
+
+    /**
+     * 管径
+     */
+    @ExcelProperty(value = "管径")
+    private String pipeDiameter;
+
+    /**
+     * 管材
+     */
+    @ExcelProperty(value = "管材")
+    private String tubularProduct;
+
+    /**
+     * 是否存在套管
+     */
+    @ExcelProperty(value = "是否存在套管")
+    private String casingPresent;
+
+    /**
+     * 管道压力
+     */
+    @ExcelProperty(value = "管道压力")
+    private String pipePressure;
+
+    /**
+     * 气源方向
+     */
+    @ExcelProperty(value = "气源方向")
+    private String gasSourceDirection;
+
+    /**
+     * 作业位置
+     */
+    @ExcelProperty(value = "作业位置")
+    private String taskPosition;
+
+    /**
+     * 与作业相关阀门位置
+     */
+    @ExcelProperty(value = "与作业相关阀门位置")
+    private String valvePosition;
+
+    /**
+     * 压力报告
+     */
+    @ExcelProperty(value = "压力报告")
+    private String stressReport;
+
+    /**
+     * 监理旁站记录
+     */
+    @ExcelProperty(value = "监理旁站记录")
+    private String supervisionRecord;
+
+    /**
+     * 工作联系单
+     */
+    @ExcelProperty(value = "工作联系单")
+    private String workContactForm;
+
+    /**
+     * 巡线确认单
+     */
+    @ExcelProperty(value = "巡线确认单")
+    private String linePatrolConfirmationForm;
+
+    /**
+     * 危险作业坑大小(长)
+     */
+    @ExcelProperty(value = "危险作业坑大小(长)")
+    private Long hazardousWorkPitsLong;
+
+    /**
+     * 危险作业坑大小(宽)
+     */
+    @ExcelProperty(value = "危险作业坑大小(宽)")
+    private Long hazardousWorkPitsWide;
+
+    /**
+     * 危险作业坑大小(深)
+     */
+    @ExcelProperty(value = "危险作业坑大小(深)")
+    private Long hazardousWorkPitsDeep;
+
+    /**
+     * 是否需要支护
+     */
+    @ExcelProperty(value = "是否需要支护")
+    private String needSupport;
+
+    /**
+     * 作业坑内其他管道情况
+     */
+    @ExcelProperty(value = "作业坑内其他管道情况")
+    private String otherPipelineConditionsWorkPit;
+
+    /**
+     * 现场负责人
+     */
+    @ExcelProperty(value = "现场负责人")
+    private String siteHead;
+
+    /**
+     * 现场负责人电话
+     */
+    @ExcelProperty(value = "现场负责人电话")
+    private String siteHeadPhone;
+
+    /**
+     * 作业人员信息
+     */
+    @ExcelProperty(value = "作业人员信息")
+    private String operatorInformation;
+
+    /**
+     * 检口
+     */
+    @ExcelProperty(value = "检口")
+    private String inspectionPort;
+
+    /**
+     * 管道刷油
+     */
+    @ExcelProperty(value = "管道刷油")
+    private String pipelinePainting;
+
+    /**
+     * 管道支护
+     */
+    @ExcelProperty(value = "管道支护")
+    private String pipelineSupport;
+
+    /**
+     * 管道防腐
+     */
+    @ExcelProperty(value = "管道防腐")
+    private String pipelineCorrosionProtection;
+
+    /**
+     * 砌筑阀门井
+     */
+    @ExcelProperty(value = "砌筑阀门井")
+    private String masonryValveWell;
+
+    /**
+     * 保护井
+     */
+    @ExcelProperty(value = "保护井")
+    private String protectionWell;
+
+    /**
+     * 管件保护井砌筑
+     */
+    @ExcelProperty(value = "管件保护井砌筑")
+    private String pipeProtectionWelMasonry;
+
+    /**
+     * 回填
+     */
+    @ExcelProperty(value = "回填")
+    private String backfill;
+
+    /**
+     * 夯实
+     */
+    @ExcelProperty(value = "夯实")
+    private String tamp;
+
+    /**
+     * 平整场地
+     */
+    @ExcelProperty(value = "平整场地")
+    private String levelingTheSite;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

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

@@ -0,0 +1,15 @@
+package com.ruoyi.zdsz.mapper;
+
+import com.ruoyi.zdsz.domain.ZEngineeringDangerous;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerousVo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 危险工程Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+public interface ZEngineeringDangerousMapper extends BaseMapperPlus<ZEngineeringDangerousMapper, ZEngineeringDangerous, ZEngineeringDangerousVo> {
+
+}

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

@@ -0,0 +1,51 @@
+package com.ruoyi.zdsz.service;
+
+import com.ruoyi.zdsz.domain.ZEngineeringDangerous;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerousVo;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringDangerousBo;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 危险工程Service接口
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+public interface IZEngineeringDangerousService {
+
+    /**
+     * 查询危险工程
+     */
+    ZEngineeringDangerousVo queryById(String id);
+
+    /**
+     * 查询危险工程列表
+     */
+    TableDataInfo<ZEngineeringDangerousVo> queryPageList(ZEngineeringDangerousBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询危险工程列表
+     */
+    List<ZEngineeringDangerousVo> queryList(ZEngineeringDangerousBo bo);
+
+    /**
+     * 新增危险工程
+     */
+    Boolean insertByBo(ZEngineeringDangerousBo bo);
+
+    Boolean insert (ZEngineeringDangerousBo bo);
+
+    /**
+     * 修改危险工程
+     */
+    Boolean updateByBo(ZEngineeringDangerousBo bo);
+
+    /**
+     * 校验并批量删除危险工程信息
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+}

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

@@ -0,0 +1,163 @@
+package com.ruoyi.zdsz.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.annotation.DynamicName;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.domain.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.service.IZEngineeringNodeService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.zdsz.domain.bo.ZEngineeringDangerousBo;
+import com.ruoyi.zdsz.domain.vo.ZEngineeringDangerousVo;
+import com.ruoyi.zdsz.domain.ZEngineeringDangerous;
+import com.ruoyi.zdsz.mapper.ZEngineeringDangerousMapper;
+import com.ruoyi.zdsz.service.IZEngineeringDangerousService;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 危险工程Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-01-02
+ */
+@RequiredArgsConstructor
+@Service
+public class ZEngineeringDangerousServiceImpl implements IZEngineeringDangerousService {
+
+    private final ZEngineeringDangerousMapper baseMapper;
+
+    @Autowired
+    private IZEngineeringNodeService izEngineeringNodeService;
+
+    /**
+     * 查询危险工程
+     */
+    @Override
+    public ZEngineeringDangerousVo queryById(String id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询危险工程列表
+     */
+    @Override
+    public TableDataInfo<ZEngineeringDangerousVo> queryPageList(ZEngineeringDangerousBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ZEngineeringDangerous> lqw = buildQueryWrapper(bo);
+        Page<ZEngineeringDangerousVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询危险工程列表
+     */
+    @Override
+    public List<ZEngineeringDangerousVo> queryList(ZEngineeringDangerousBo bo) {
+        LambdaQueryWrapper<ZEngineeringDangerous> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ZEngineeringDangerous> buildQueryWrapper(ZEngineeringDangerousBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<ZEngineeringDangerous> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getBasicInformation()), ZEngineeringDangerous::getBasicInformation, bo.getBasicInformation());
+        lqw.like(StringUtils.isNotBlank(bo.getEnginName()), ZEngineeringDangerous::getEnginName, bo.getEnginName());
+        lqw.eq(StringUtils.isNotBlank(bo.getEnginAddre()), ZEngineeringDangerous::getEnginAddre, bo.getEnginAddre());
+        lqw.eq(bo.getEnginTime() != null, ZEngineeringDangerous::getEnginTime, bo.getEnginTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getPipeDiameter()), ZEngineeringDangerous::getPipeDiameter, bo.getPipeDiameter());
+        lqw.eq(StringUtils.isNotBlank(bo.getTubularProduct()), ZEngineeringDangerous::getTubularProduct, bo.getTubularProduct());
+        lqw.eq(StringUtils.isNotBlank(bo.getCasingPresent()), ZEngineeringDangerous::getCasingPresent, bo.getCasingPresent());
+        lqw.eq(StringUtils.isNotBlank(bo.getPipePressure()), ZEngineeringDangerous::getPipePressure, bo.getPipePressure());
+        lqw.eq(StringUtils.isNotBlank(bo.getGasSourceDirection()), ZEngineeringDangerous::getGasSourceDirection, bo.getGasSourceDirection());
+        lqw.eq(StringUtils.isNotBlank(bo.getTaskPosition()), ZEngineeringDangerous::getTaskPosition, bo.getTaskPosition());
+        lqw.eq(StringUtils.isNotBlank(bo.getValvePosition()), ZEngineeringDangerous::getValvePosition, bo.getValvePosition());
+        lqw.eq(StringUtils.isNotBlank(bo.getStressReport()), ZEngineeringDangerous::getStressReport, bo.getStressReport());
+        lqw.eq(StringUtils.isNotBlank(bo.getSupervisionRecord()), ZEngineeringDangerous::getSupervisionRecord, bo.getSupervisionRecord());
+        lqw.eq(StringUtils.isNotBlank(bo.getWorkContactForm()), ZEngineeringDangerous::getWorkContactForm, bo.getWorkContactForm());
+        lqw.eq(StringUtils.isNotBlank(bo.getLinePatrolConfirmationForm()), ZEngineeringDangerous::getLinePatrolConfirmationForm, bo.getLinePatrolConfirmationForm());
+        lqw.eq(bo.getHazardousWorkPitsLong() != null, ZEngineeringDangerous::getHazardousWorkPitsLong, bo.getHazardousWorkPitsLong());
+        lqw.eq(bo.getHazardousWorkPitsWide() != null, ZEngineeringDangerous::getHazardousWorkPitsWide, bo.getHazardousWorkPitsWide());
+        lqw.eq(bo.getHazardousWorkPitsDeep() != null, ZEngineeringDangerous::getHazardousWorkPitsDeep, bo.getHazardousWorkPitsDeep());
+        lqw.eq(StringUtils.isNotBlank(bo.getNeedSupport()), ZEngineeringDangerous::getNeedSupport, bo.getNeedSupport());
+        lqw.eq(StringUtils.isNotBlank(bo.getOtherPipelineConditionsWorkPit()), ZEngineeringDangerous::getOtherPipelineConditionsWorkPit, bo.getOtherPipelineConditionsWorkPit());
+        lqw.eq(StringUtils.isNotBlank(bo.getSiteHead()), ZEngineeringDangerous::getSiteHead, bo.getSiteHead());
+        lqw.eq(StringUtils.isNotBlank(bo.getSiteHeadPhone()), ZEngineeringDangerous::getSiteHeadPhone, bo.getSiteHeadPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getOperatorInformation()), ZEngineeringDangerous::getOperatorInformation, bo.getOperatorInformation());
+        lqw.eq(StringUtils.isNotBlank(bo.getInspectionPort()), ZEngineeringDangerous::getInspectionPort, bo.getInspectionPort());
+        lqw.eq(StringUtils.isNotBlank(bo.getPipelinePainting()), ZEngineeringDangerous::getPipelinePainting, bo.getPipelinePainting());
+        lqw.eq(StringUtils.isNotBlank(bo.getPipelineSupport()), ZEngineeringDangerous::getPipelineSupport, bo.getPipelineSupport());
+        lqw.eq(StringUtils.isNotBlank(bo.getPipelineCorrosionProtection()), ZEngineeringDangerous::getPipelineCorrosionProtection, bo.getPipelineCorrosionProtection());
+        lqw.eq(StringUtils.isNotBlank(bo.getMasonryValveWell()), ZEngineeringDangerous::getMasonryValveWell, bo.getMasonryValveWell());
+        lqw.eq(StringUtils.isNotBlank(bo.getProtectionWell()), ZEngineeringDangerous::getProtectionWell, bo.getProtectionWell());
+        lqw.eq(StringUtils.isNotBlank(bo.getPipeProtectionWelMasonry()), ZEngineeringDangerous::getPipeProtectionWelMasonry, bo.getPipeProtectionWelMasonry());
+        lqw.eq(StringUtils.isNotBlank(bo.getBackfill()), ZEngineeringDangerous::getBackfill, bo.getBackfill());
+        lqw.eq(StringUtils.isNotBlank(bo.getTamp()), ZEngineeringDangerous::getTamp, bo.getTamp());
+        lqw.eq(StringUtils.isNotBlank(bo.getLevelingTheSite()), ZEngineeringDangerous::getLevelingTheSite, bo.getLevelingTheSite());
+        return lqw;
+    }
+
+    /**
+     * 新增危险工程
+     */
+    @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());
+        }
+        return flag;
+    }
+
+    @Override
+    @Transactional(rollbackFor=Exception.class)
+    @DynamicName(spel = "#bo.createTime")
+    public Boolean insert(ZEngineeringDangerousBo bo) {
+        ZEngineeringDangerous add = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        bo.getzEngineeringNodeBo().setCivliId(add.getId());
+        izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
+        return flag;
+    }
+
+    /**
+     * 修改危险工程
+     */
+    @Override
+    public Boolean updateByBo(ZEngineeringDangerousBo bo) {
+        ZEngineeringDangerous update = BeanUtil.toBean(bo, ZEngineeringDangerous.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ZEngineeringDangerous entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除危险工程
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

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

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.zdsz.mapper.ZEngineeringDangerousMapper">
+
+    <resultMap type="com.ruoyi.zdsz.domain.ZEngineeringDangerous" id="ZEngineeringDangerousResult">
+        <result property="id" column="id"/>
+        <result property="basicInformation" column="basic_information"/>
+        <result property="enginName" column="engin_name"/>
+        <result property="enginAddre" column="engin_addre"/>
+        <result property="enginTime" column="engin_time"/>
+        <result property="pipeDiameter" column="pipe_diameter"/>
+        <result property="tubularProduct" column="tubular_product"/>
+        <result property="casingPresent" column="casing_present"/>
+        <result property="pipePressure" column="pipe_pressure"/>
+        <result property="gasSourceDirection" column="gas_source_direction"/>
+        <result property="taskPosition" column="task_position"/>
+        <result property="valvePosition" column="valve_position"/>
+        <result property="stressReport" column="stress_report"/>
+        <result property="supervisionRecord" column="supervision_record"/>
+        <result property="workContactForm" column="work_contact_form"/>
+        <result property="linePatrolConfirmationForm" column="line_patrol_confirmation_form"/>
+        <result property="hazardousWorkPitsLong" column="hazardous_work_pits_long"/>
+        <result property="hazardousWorkPitsWide" column="hazardous_work_pits_wide"/>
+        <result property="hazardousWorkPitsDeep" column="hazardous_work_pits_deep"/>
+        <result property="needSupport" column="need_support"/>
+        <result property="otherPipelineConditionsWorkPit" column="other_pipeline_conditions_work_pit"/>
+        <result property="siteHead" column="site_head"/>
+        <result property="siteHeadPhone" column="site_head_phone"/>
+        <result property="operatorInformation" column="operator_information"/>
+        <result property="inspectionPort" column="inspection_port"/>
+        <result property="pipelinePainting" column="pipeline_painting"/>
+        <result property="pipelineSupport" column="pipeline_support"/>
+        <result property="pipelineCorrosionProtection" column="pipeline_corrosion_protection"/>
+        <result property="masonryValveWell" column="masonry_valve_well"/>
+        <result property="protectionWell" column="protection_well"/>
+        <result property="pipeProtectionWelMasonry" column="pipe_protection_wel_masonry"/>
+        <result property="backfill" column="backfill"/>
+        <result property="tamp" column="tamp"/>
+        <result property="levelingTheSite" column="leveling_the_site"/>
+        <result property="version" column="version"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+
+</mapper>