wangtong 1 سال پیش
والد
کامیت
284d9f190c

+ 113 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GPipelineGasUserController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.web.controller.gas;
+
+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.AjaxResult;
+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.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.bo.GPipelineGasUserBo;
+import com.ruoyi.gas.domain.vo.GPipelineGasUserVo;
+import com.ruoyi.gas.service.IGPipelineGasUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+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;
+
+/**
+ * 非居民巡查Controller
+ *
+ * @author ruoyi
+ * @date 2024-05-16
+ */
+@Validated
+@Api(value = "非居民巡查控制器", tags = {"非居民巡查管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/system/pipelineGasUser")
+public class GPipelineGasUserController extends BaseController {
+
+    private final IGPipelineGasUserService iGPipelineGasUserService;
+
+    /**
+     * 查询非居民巡查列表
+     */
+    @ApiOperation("查询非居民巡查列表")
+    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GPipelineGasUserVo> list(@Validated(QueryGroup.class) GPipelineGasUserBo bo) {
+        return iGPipelineGasUserService.queryPageList(bo);
+    }
+
+    /**
+     * 导出非居民巡查列表
+     */
+    @ApiOperation("导出非居民巡查列表")
+    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:export')")
+    @Log(title = "非居民巡查", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated GPipelineGasUserBo bo, HttpServletResponse response) {
+        List<GPipelineGasUserVo> list = iGPipelineGasUserService.queryList(bo);
+        ExcelUtil.exportExcel(list, "非居民巡查", GPipelineGasUserVo.class, response);
+    }
+
+    /**
+     * 获取非居民巡查详细信息
+     */
+    @ApiOperation("获取非居民巡查详细信息")
+    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<GPipelineGasUserVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return AjaxResult.success(iGPipelineGasUserService.queryById(id));
+    }
+
+    /**
+     * 新增非居民巡查
+     */
+    @ApiOperation("新增非居民巡查")
+    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:add')")
+    @Log(title = "非居民巡查", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody GPipelineGasUserBo bo) {
+        return toAjax(iGPipelineGasUserService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改非居民巡查
+     */
+    @ApiOperation("修改非居民巡查")
+    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:edit')")
+    @Log(title = "非居民巡查", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody GPipelineGasUserBo bo) {
+        return toAjax(iGPipelineGasUserService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除非居民巡查
+     */
+    @ApiOperation("删除非居民巡查")
+    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:remove')")
+    @Log(title = "非居民巡查" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids) {
+        return toAjax(iGPipelineGasUserService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

+ 113 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MPipelineGasUserController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.web.controller.mobile;
+
+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.AjaxResult;
+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.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.bo.GPipelineGasUserBo;
+import com.ruoyi.gas.domain.vo.GPipelineGasUserVo;
+import com.ruoyi.gas.service.IGPipelineGasUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+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;
+
+/**
+ * 非居民巡查Controller
+ *
+ * @author ruoyi
+ * @date 2024-05-16
+ */
+@Validated
+@Api(value = "非居民巡查控制器", tags = {"非居民巡查管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/mobile/pipelineGasUser")
+public class MPipelineGasUserController extends BaseController {
+
+    private final IGPipelineGasUserService iGPipelineGasUserService;
+
+    /**
+     * 查询非居民巡查列表
+     */
+    @ApiOperation("查询非居民巡查列表")
+    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GPipelineGasUserVo> list(@Validated(QueryGroup.class) GPipelineGasUserBo bo) {
+        return iGPipelineGasUserService.queryPageList(bo);
+    }
+
+    /**
+     * 导出非居民巡查列表
+     */
+    @ApiOperation("导出非居民巡查列表")
+    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:export')")
+    @Log(title = "非居民巡查", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated GPipelineGasUserBo bo, HttpServletResponse response) {
+        List<GPipelineGasUserVo> list = iGPipelineGasUserService.queryList(bo);
+        ExcelUtil.exportExcel(list, "非居民巡查", GPipelineGasUserVo.class, response);
+    }
+
+    /**
+     * 获取非居民巡查详细信息
+     */
+    @ApiOperation("获取非居民巡查详细信息")
+    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<GPipelineGasUserVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return AjaxResult.success(iGPipelineGasUserService.queryById(id));
+    }
+
+    /**
+     * 新增非居民巡查
+     */
+    @ApiOperation("新增非居民巡查")
+    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:add')")
+    @Log(title = "非居民巡查", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody GPipelineGasUserBo bo) {
+        return toAjax(iGPipelineGasUserService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改非居民巡查
+     */
+    @ApiOperation("修改非居民巡查")
+    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:edit')")
+    @Log(title = "非居民巡查", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody GPipelineGasUserBo bo) {
+        return toAjax(iGPipelineGasUserService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除非居民巡查
+     */
+    @ApiOperation("删除非居民巡查")
+    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:remove')")
+    @Log(title = "非居民巡查" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids) {
+        return toAjax(iGPipelineGasUserService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

+ 195 - 0
ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GPipelineGasUser.java

@@ -0,0 +1,195 @@
+package com.ruoyi.gas.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 非居民巡查对象 g_pipeline_gas_user
+ *
+ * @author ruoyi
+ * @date 2024-05-16
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_pipeline_gas_user")
+public class GPipelineGasUser extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 用户名称
+     */
+    private String userName;
+    /**
+     * 用户编号
+     */
+    private Long userNumber;
+    /**
+     * 用户类型
+     */
+    private String userType;
+    /**
+     * 阀门外观
+     */
+    private String valveAppearance;
+    /**
+     * 开关是否灵敏有效
+     */
+    private String sensitives;
+    /**
+     * 类型
+     */
+    private String type;
+    /**
+     * 箱体外观
+     */
+    private String cabinetAppearance;
+    /**
+     * 锅炉外观
+     */
+    private String boilerAppearance;
+    /**
+     * 锅炉运行情况
+     */
+    private String boilerExterior;
+    /**
+     * 管道
+     */
+    private String pipeline;
+    /**
+     * 计量表具
+     */
+    private String measuringInstruments;
+    /**
+     * 餐饮设备运行情况
+     */
+    private String cateringStatus;
+    /**
+     * 餐饮设备外观
+     */
+    private String cateringExterior;
+    /**
+     * 连接管
+     */
+    private String connectingPipe;
+    /**
+     * 凝水杠
+     */
+    private String condensateBar;
+    /**
+     * 有无私接私改
+     */
+    private String receptionModification;
+    /**
+     * 压力表运行情况
+     */
+    private String pressureStatus;
+    /**
+     * 可燃气体报警器装置
+     */
+    private String combustibleGas;
+    /**
+     * 可燃气体报警器装置
+     */
+    private String combustibleGasB;
+    /**
+     * 紧急切断阀
+     */
+    private String emergencyShut;
+    /**
+     * 安全阀
+     */
+    private String safetyValve;
+    /**
+     * 流向标识label
+     */
+    private String flowDirectionLabel;
+    /**
+     * 流向标识
+     */
+    private String flowDirection;
+    /**
+     * 有无易燃物
+     */
+    private String flammableMaterials;
+    /**
+     * 有无占压
+     */
+    private String pressure;
+    /**
+     * 两气混用
+     */
+    private String mixingGases;
+    /**
+     * 重物搭挂
+     */
+    private String heavyHanging;
+    /**
+     * 电线缠绕
+     */
+    private String wireTangle;
+    /**
+     * 其他
+     */
+    private String other;
+    /**
+     * 安检情况1
+     */
+    private String securityCheckOne;
+    /**
+     * 安检情况2
+     */
+    private String securityCheckTwo;
+    /**
+     * 安检员签字
+     */
+    private String securityCheckUser;
+    /**
+     * 安检时间
+     */
+    private Date securityCheckTime;
+    /**
+     * 用户代表签字
+     */
+    private String representative;
+    /**
+     * 联系电话
+     */
+    private String phone;
+    /**
+     * 有无易燃物label
+     */
+    private String flammableMaterialsLabel;
+    /**
+     * 有无占压label
+     */
+    private String pressureLabel;
+    /**
+     * 两气混用label
+     */
+    private String mixingGasesLabel;
+    /**
+     * 重物搭挂label
+     */
+    private String heavyHangingLabel;
+    /**
+     * 电线缠绕label
+     */
+    private String wireTangleLabel;
+    /**
+     * 连接管胶管
+     */
+    private String connectingPipeB;
+    private String emergencyShutB;
+
+}

+ 344 - 0
ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GPipelineGasUserBo.java

@@ -0,0 +1,344 @@
+package com.ruoyi.gas.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * 非居民巡查业务对象 g_pipeline_gas_user
+ *
+ * @author ruoyi
+ * @date 2024-05-16
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("非居民巡查业务对象")
+public class GPipelineGasUserBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id", required = true)
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 用户名称
+     */
+    @ApiModelProperty(value = "用户名称", required = true)
+    @NotBlank(message = "用户名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String userName;
+
+    /**
+     * 用户编号
+     */
+    @ApiModelProperty(value = "用户编号", required = true)
+     @NotNull(message = "用户编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long userNumber;
+
+    /**
+     * 用户类型
+     */
+    @ApiModelProperty(value = "用户类型", required = true)
+     @NotBlank(message = "用户类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String userType;
+
+    /**
+     * 阀门外观
+     */
+    @ApiModelProperty(value = "阀门外观", required = true)
+    // @NotBlank(message = "阀门外观不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String valveAppearance;
+
+    /**
+     * 开关是否灵敏有效
+     */
+    @ApiModelProperty(value = "开关是否灵敏有效", required = true)
+    // @NotBlank(message = "开关是否灵敏有效不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String sensitives;
+
+    /**
+     * 类型
+     */
+    @ApiModelProperty(value = "类型", required = true)
+    // @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String type;
+
+    /**
+     * 箱体外观
+     */
+    @ApiModelProperty(value = "箱体外观", required = true)
+    // @NotBlank(message = "箱体外观不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String cabinetAppearance;
+
+    /**
+     * 锅炉外观
+     */
+    @ApiModelProperty(value = "锅炉外观", required = true)
+    // @NotBlank(message = "锅炉外观不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String boilerAppearance;
+
+    /**
+     * 锅炉运行情况
+     */
+    @ApiModelProperty(value = "锅炉运行情况", required = true)
+    // @NotBlank(message = "锅炉运行情况不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String boilerExterior;
+
+    /**
+     * 管道
+     */
+    @ApiModelProperty(value = "管道", required = true)
+    // @NotBlank(message = "管道不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pipeline;
+
+    /**
+     * 计量表具
+     */
+    @ApiModelProperty(value = "计量表具", required = true)
+    // @NotBlank(message = "计量表具不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String measuringInstruments;
+
+    /**
+     * 餐饮设备运行情况
+     */
+    @ApiModelProperty(value = "餐饮设备运行情况", required = true)
+    //  @NotBlank(message = "餐饮设备运行情况不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String cateringStatus;
+
+    /**
+     * 餐饮设备外观
+     */
+    @ApiModelProperty(value = "餐饮设备外观", required = true)
+    // @NotBlank(message = "餐饮设备外观不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String cateringExterior;
+
+    /**
+     * 连接管
+     */
+    @ApiModelProperty(value = "连接管", required = true)
+    // @NotBlank(message = "连接管不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String connectingPipe;
+
+    /**
+     * 凝水杠
+     */
+    @ApiModelProperty(value = "凝水杠", required = true)
+    // @NotBlank(message = "凝水杠不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String condensateBar;
+
+    /**
+     * 有无私接私改
+     */
+    @ApiModelProperty(value = "有无私接私改", required = true)
+    // @NotBlank(message = "有无私接私改不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String receptionModification;
+
+    /**
+     * 压力表运行情况
+     */
+    @ApiModelProperty(value = "压力表运行情况", required = true)
+    // @NotBlank(message = "压力表运行情况不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pressureStatus;
+
+    /**
+     * 可燃气体报警器装置
+     */
+    @ApiModelProperty(value = "可燃气体报警器装置", required = true)
+   // @NotBlank(message = "可燃气体报警器装置不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String combustibleGas;
+
+    /**
+     * 紧急切断阀
+     */
+    @ApiModelProperty(value = "紧急切断阀", required = true)
+    // @NotBlank(message = "紧急切断阀不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String emergencyShut;
+    @ApiModelProperty(value = "紧急切断阀", required = true)
+    //@NotBlank(message = "紧急切断阀不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String emergencyShutB;
+
+    /**
+     * 安全阀
+     */
+    @ApiModelProperty(value = "安全阀", required = true)
+    // @NotBlank(message = "安全阀不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String safetyValve;
+
+    /**
+     * 流向标识label
+     */
+    @ApiModelProperty(value = "流向标识label", required = true)
+    //  @NotBlank(message = "流向标识label不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String flowDirectionLabel;
+
+    /**
+     * 流向标识
+     */
+    @ApiModelProperty(value = "流向标识", required = true)
+    // @NotBlank(message = "流向标识不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String flowDirection;
+
+    /**
+     * 有无易燃物
+     */
+    @ApiModelProperty(value = "有无易燃物", required = true)
+    // @NotBlank(message = "有无易燃物不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String flammableMaterials;
+
+    /**
+     * 有无占压
+     */
+    @ApiModelProperty(value = "有无占压", required = true)
+    // @NotBlank(message = "有无占压不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pressure;
+
+    /**
+     * 两气混用
+     */
+    @ApiModelProperty(value = "两气混用", required = true)
+    // @NotBlank(message = "两气混用不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String mixingGases;
+
+    /**
+     * 重物搭挂
+     */
+    @ApiModelProperty(value = "重物搭挂", required = true)
+    // @NotBlank(message = "重物搭挂不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String heavyHanging;
+
+    /**
+     * 电线缠绕
+     */
+    @ApiModelProperty(value = "电线缠绕", required = true)
+    // @NotBlank(message = "电线缠绕不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String wireTangle;
+
+    /**
+     * 其他
+     */
+    @ApiModelProperty(value = "其他", required = true)
+    // @NotBlank(message = "其他不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String other;
+
+    /**
+     * 安检情况1
+     */
+    @ApiModelProperty(value = "安检情况1", required = true)
+    // @NotBlank(message = "安检情况1不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String securityCheckOne;
+
+    /**
+     * 安检情况2
+     */
+    @ApiModelProperty(value = "安检情况2", required = true)
+    // @NotBlank(message = "安检情况2不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String securityCheckTwo;
+
+    /**
+     * 安检员签字
+     */
+    @ApiModelProperty(value = "安检员签字", required = true)
+    // @NotBlank(message = "安检员签字不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String securityCheckUser;
+
+    /**
+     * 安检时间
+     */
+    @ApiModelProperty(value = "安检时间", required = true)
+    // @NotNull(message = "安检时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date securityCheckTime;
+
+    /**
+     * 用户代表签字
+     */
+    @ApiModelProperty(value = "用户代表签字", required = true)
+    // @NotBlank(message = "用户代表签字不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String representative;
+
+    /**
+     * 联系电话
+     */
+    @ApiModelProperty(value = "联系电话", required = true)
+    // @NotBlank(message = "联系电话不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String phone;
+
+    /**
+     * 有无易燃物label
+     */
+    @ApiModelProperty(value = "有无易燃物label", required = true)
+    // @NotBlank(message = "有无易燃物label不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String flammableMaterialsLabel;
+
+    /**
+     * 有无占压label
+     */
+    @ApiModelProperty(value = "有无占压label", required = true)
+    // @NotBlank(message = "有无占压label不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pressureLabel;
+
+    /**
+     * 两气混用label
+     */
+    @ApiModelProperty(value = "两气混用label", required = true)
+    // @NotBlank(message = "两气混用label不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String mixingGasesLabel;
+
+    /**
+     * 重物搭挂label
+     */
+    @ApiModelProperty(value = "重物搭挂label", required = true)
+    // @NotBlank(message = "重物搭挂label不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String heavyHangingLabel;
+
+    /**
+     * 电线缠绕label
+     */
+    @ApiModelProperty(value = "电线缠绕label", required = true)
+    // @NotBlank(message = "电线缠绕label不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String wireTangleLabel;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+    /**
+     * 连接管胶管
+     */
+
+    @ApiModelProperty("连接管胶管")
+    private String connectingPipeB;
+    @ApiModelProperty(value = "可燃气体报警器装置", required = true)
+    //  @NotBlank(message = "可燃气体报警器装置不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String combustibleGasB;
+
+}

+ 326 - 0
ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GPipelineGasUserVo.java

@@ -0,0 +1,326 @@
+package com.ruoyi.gas.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+
+
+/**
+ * 非居民巡查视图对象 g_pipeline_gas_user
+ *
+ * @author ruoyi
+ * @date 2024-05-16
+ */
+@Data
+@ApiModel("非居民巡查视图对象")
+@ExcelIgnoreUnannotated
+public class GPipelineGasUserVo {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+	@ExcelProperty(value = "主键id")
+	@ApiModelProperty("主键id")
+	private Long id;
+
+    /**
+     * 用户名称
+     */
+	@ExcelProperty(value = "用户名称")
+	@ApiModelProperty("用户名称")
+	private String userName;
+
+    /**
+     * 用户编号
+     */
+	@ExcelProperty(value = "用户编号")
+	@ApiModelProperty("用户编号")
+	private Long userNumber;
+
+    /**
+     * 用户类型
+     */
+	@ExcelProperty(value = "用户类型")
+	@ApiModelProperty("用户类型")
+	private String userType;
+
+    /**
+     * 阀门外观
+     */
+	@ExcelProperty(value = "阀门外观")
+	@ApiModelProperty("阀门外观")
+	private String valveAppearance;
+
+    /**
+     * 开关是否灵敏有效
+     */
+	@ExcelProperty(value = "开关是否灵敏有效")
+	@ApiModelProperty("开关是否灵敏有效")
+	private String sensitives;
+
+    /**
+     * 类型
+     */
+	@ExcelProperty(value = "类型")
+	@ApiModelProperty("类型")
+	private String type;
+
+    /**
+     * 箱体外观
+     */
+	@ExcelProperty(value = "箱体外观")
+	@ApiModelProperty("箱体外观")
+	private String cabinetAppearance;
+
+    /**
+     * 锅炉外观
+     */
+	@ExcelProperty(value = "锅炉外观")
+	@ApiModelProperty("锅炉外观")
+	private String boilerAppearance;
+
+    /**
+     * 锅炉运行情况
+     */
+	@ExcelProperty(value = "锅炉运行情况")
+	@ApiModelProperty("锅炉运行情况")
+	private String boilerExterior;
+
+    /**
+     * 管道
+     */
+	@ExcelProperty(value = "管道")
+	@ApiModelProperty("管道")
+	private String pipeline;
+
+    /**
+     * 计量表具
+     */
+	@ExcelProperty(value = "计量表具")
+	@ApiModelProperty("计量表具")
+	private String measuringInstruments;
+
+    /**
+     * 餐饮设备运行情况
+     */
+	@ExcelProperty(value = "餐饮设备运行情况")
+	@ApiModelProperty("餐饮设备运行情况")
+	private String cateringStatus;
+
+    /**
+     * 餐饮设备外观
+     */
+	@ExcelProperty(value = "餐饮设备外观")
+	@ApiModelProperty("餐饮设备外观")
+	private String cateringExterior;
+
+    /**
+     * 连接管
+     */
+	@ExcelProperty(value = "连接管")
+	@ApiModelProperty("连接管")
+	private String connectingPipe;
+	/**
+	 * 连接管胶管
+	 */
+	@ExcelProperty(value = "连接管胶管")
+	@ApiModelProperty("连接管胶管")
+	private String connectingPipeB;
+
+    /**
+     * 凝水杠
+     */
+	@ExcelProperty(value = "凝水杠")
+	@ApiModelProperty("凝水杠")
+	private String condensateBar;
+
+    /**
+     * 有无私接私改
+     */
+	@ExcelProperty(value = "有无私接私改")
+	@ApiModelProperty("有无私接私改")
+	private String receptionModification;
+
+    /**
+     * 压力表运行情况
+     */
+	@ExcelProperty(value = "压力表运行情况")
+	@ApiModelProperty("压力表运行情况")
+	private String pressureStatus;
+
+    /**
+     * 可燃气体报警器装置
+     */
+	@ExcelProperty(value = "可燃气体报警器装置")
+	@ApiModelProperty("可燃气体报警器装置")
+	private String combustibleGas;
+	/**
+	 * 可燃气体报警器装置
+	 */
+	@ExcelProperty(value = "可燃气体报警器装置")
+	@ApiModelProperty("可燃气体报警器装置")
+	private String combustibleGasB;
+
+
+    /**
+     * 紧急切断阀
+     */
+	@ExcelProperty(value = "紧急切断阀")
+	@ApiModelProperty("紧急切断阀")
+	private String emergencyShut;
+	/**
+	 * 紧急切断阀
+	 */
+	@ExcelProperty(value = "紧急切断阀")
+	@ApiModelProperty("紧急切断阀")
+	private String emergencyShutB;
+
+    /**
+     * 安全阀
+     */
+	@ExcelProperty(value = "安全阀")
+	@ApiModelProperty("安全阀")
+	private String safetyValve;
+
+    /**
+     * 流向标识label
+     */
+	@ExcelProperty(value = "流向标识label")
+	@ApiModelProperty("流向标识label")
+	private String flowDirectionLabel;
+
+    /**
+     * 流向标识
+     */
+	@ExcelProperty(value = "流向标识")
+	@ApiModelProperty("流向标识")
+	private String flowDirection;
+
+    /**
+     * 有无易燃物
+     */
+	@ExcelProperty(value = "有无易燃物")
+	@ApiModelProperty("有无易燃物")
+	private String flammableMaterials;
+
+    /**
+     * 有无占压
+     */
+	@ExcelProperty(value = "有无占压")
+	@ApiModelProperty("有无占压")
+	private String pressure;
+
+    /**
+     * 两气混用
+     */
+	@ExcelProperty(value = "两气混用")
+	@ApiModelProperty("两气混用")
+	private String mixingGases;
+
+    /**
+     * 重物搭挂
+     */
+	@ExcelProperty(value = "重物搭挂")
+	@ApiModelProperty("重物搭挂")
+	private String heavyHanging;
+
+    /**
+     * 电线缠绕
+     */
+	@ExcelProperty(value = "电线缠绕")
+	@ApiModelProperty("电线缠绕")
+	private String wireTangle;
+
+    /**
+     * 其他
+     */
+	@ExcelProperty(value = "其他")
+	@ApiModelProperty("其他")
+	private String other;
+
+    /**
+     * 安检情况1
+     */
+	@ExcelProperty(value = "安检情况1")
+	@ApiModelProperty("安检情况1")
+	private String securityCheckOne;
+
+    /**
+     * 安检情况2
+     */
+	@ExcelProperty(value = "安检情况2")
+	@ApiModelProperty("安检情况2")
+	private String securityCheckTwo;
+
+    /**
+     * 安检员签字
+     */
+	@ExcelProperty(value = "安检员签字")
+	@ApiModelProperty("安检员签字")
+	private String securityCheckUser;
+
+    /**
+     * 安检时间
+     */
+	@ExcelProperty(value = "安检时间")
+	@ApiModelProperty("安检时间")
+	private Date securityCheckTime;
+
+    /**
+     * 用户代表签字
+     */
+	@ExcelProperty(value = "用户代表签字")
+	@ApiModelProperty("用户代表签字")
+	private String representative;
+
+    /**
+     * 联系电话
+     */
+	@ExcelProperty(value = "联系电话")
+	@ApiModelProperty("联系电话")
+	private String phone;
+
+    /**
+     * 有无易燃物label
+     */
+	@ExcelProperty(value = "有无易燃物label")
+	@ApiModelProperty("有无易燃物label")
+	private String flammableMaterialsLabel;
+
+    /**
+     * 有无占压label
+     */
+	@ExcelProperty(value = "有无占压label")
+	@ApiModelProperty("有无占压label")
+	private String pressureLabel;
+
+    /**
+     * 两气混用label
+     */
+	@ExcelProperty(value = "两气混用label")
+	@ApiModelProperty("两气混用label")
+	private String mixingGasesLabel;
+
+    /**
+     * 重物搭挂label
+     */
+	@ExcelProperty(value = "重物搭挂label")
+	@ApiModelProperty("重物搭挂label")
+	private String heavyHangingLabel;
+
+    /**
+     * 电线缠绕label
+     */
+	@ExcelProperty(value = "电线缠绕label")
+	@ApiModelProperty("电线缠绕label")
+	private String wireTangleLabel;
+
+
+}

+ 14 - 0
ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GPipelineGasUserMapper.java

@@ -0,0 +1,14 @@
+package com.ruoyi.gas.mapper;
+
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.gas.domain.GPipelineGasUser;
+
+/**
+ * 非居民巡查Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-05-16
+ */
+public interface GPipelineGasUserMapper extends BaseMapperPlus<GPipelineGasUser> {
+
+}

+ 56 - 0
ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGPipelineGasUserService.java

@@ -0,0 +1,56 @@
+package com.ruoyi.gas.service;
+
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.gas.domain.GPipelineGasUser;
+import com.ruoyi.gas.domain.bo.GPipelineGasUserBo;
+import com.ruoyi.gas.domain.vo.GPipelineGasUserVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 非居民巡查Service接口
+ *
+ * @author ruoyi
+ * @date 2024-05-16
+ */
+public interface IGPipelineGasUserService extends IServicePlus<GPipelineGasUser, GPipelineGasUserVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GPipelineGasUserVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GPipelineGasUserVo> queryPageList(GPipelineGasUserBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GPipelineGasUserVo> queryList(GPipelineGasUserBo bo);
+
+	/**
+	 * 根据新增业务对象插入非居民巡查
+	 * @param bo 非居民巡查新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GPipelineGasUserBo bo);
+
+	/**
+	 * 根据编辑业务对象修改非居民巡查
+	 * @param bo 非居民巡查编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GPipelineGasUserBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

+ 126 - 0
ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPipelineGasUserServiceImpl.java

@@ -0,0 +1,126 @@
+package com.ruoyi.gas.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.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.gas.domain.GPipelineGasUser;
+import com.ruoyi.gas.domain.bo.GPipelineGasUserBo;
+import com.ruoyi.gas.domain.vo.GPipelineGasUserVo;
+import com.ruoyi.gas.mapper.GPipelineGasUserMapper;
+import com.ruoyi.gas.service.IGPipelineGasUserService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 非居民巡查Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-05-16
+ */
+@Service
+public class GPipelineGasUserServiceImpl extends ServicePlusImpl<GPipelineGasUserMapper, GPipelineGasUser, GPipelineGasUserVo> implements IGPipelineGasUserService {
+
+    @Override
+    public GPipelineGasUserVo queryById(Long id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<GPipelineGasUserVo> queryPageList(GPipelineGasUserBo bo) {
+        PagePlus<GPipelineGasUser, GPipelineGasUserVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GPipelineGasUserVo> queryList(GPipelineGasUserBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GPipelineGasUser> buildQueryWrapper(GPipelineGasUserBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GPipelineGasUser> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getUserName()), GPipelineGasUser::getUserName, bo.getUserName());
+        lqw.eq(bo.getUserNumber() != null, GPipelineGasUser::getUserNumber, bo.getUserNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getUserType()), GPipelineGasUser::getUserType, bo.getUserType());
+        lqw.eq(StringUtils.isNotBlank(bo.getValveAppearance()), GPipelineGasUser::getValveAppearance, bo.getValveAppearance());
+        lqw.eq(StringUtils.isNotBlank(bo.getSensitives()), GPipelineGasUser::getSensitives, bo.getSensitives());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), GPipelineGasUser::getType, bo.getType());
+        lqw.eq(StringUtils.isNotBlank(bo.getCabinetAppearance()), GPipelineGasUser::getCabinetAppearance, bo.getCabinetAppearance());
+        lqw.eq(StringUtils.isNotBlank(bo.getBoilerAppearance()), GPipelineGasUser::getBoilerAppearance, bo.getBoilerAppearance());
+        lqw.eq(StringUtils.isNotBlank(bo.getBoilerExterior()), GPipelineGasUser::getBoilerExterior, bo.getBoilerExterior());
+        lqw.eq(StringUtils.isNotBlank(bo.getPipeline()), GPipelineGasUser::getPipeline, bo.getPipeline());
+        lqw.eq(StringUtils.isNotBlank(bo.getMeasuringInstruments()), GPipelineGasUser::getMeasuringInstruments, bo.getMeasuringInstruments());
+        lqw.eq(StringUtils.isNotBlank(bo.getCateringStatus()), GPipelineGasUser::getCateringStatus, bo.getCateringStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getCateringExterior()), GPipelineGasUser::getCateringExterior, bo.getCateringExterior());
+        lqw.eq(StringUtils.isNotBlank(bo.getConnectingPipe()), GPipelineGasUser::getConnectingPipe, bo.getConnectingPipe());
+        lqw.eq(StringUtils.isNotBlank(bo.getCondensateBar()), GPipelineGasUser::getCondensateBar, bo.getCondensateBar());
+        lqw.eq(StringUtils.isNotBlank(bo.getReceptionModification()), GPipelineGasUser::getReceptionModification, bo.getReceptionModification());
+        lqw.eq(StringUtils.isNotBlank(bo.getPressureStatus()), GPipelineGasUser::getPressureStatus, bo.getPressureStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getCombustibleGas()), GPipelineGasUser::getCombustibleGas, bo.getCombustibleGas());
+        lqw.eq(StringUtils.isNotBlank(bo.getEmergencyShut()), GPipelineGasUser::getEmergencyShut, bo.getEmergencyShut());
+        lqw.eq(StringUtils.isNotBlank(bo.getSafetyValve()), GPipelineGasUser::getSafetyValve, bo.getSafetyValve());
+        lqw.eq(StringUtils.isNotBlank(bo.getFlowDirectionLabel()), GPipelineGasUser::getFlowDirectionLabel, bo.getFlowDirectionLabel());
+        lqw.eq(StringUtils.isNotBlank(bo.getFlowDirection()), GPipelineGasUser::getFlowDirection, bo.getFlowDirection());
+        lqw.eq(StringUtils.isNotBlank(bo.getFlammableMaterials()), GPipelineGasUser::getFlammableMaterials, bo.getFlammableMaterials());
+        lqw.eq(StringUtils.isNotBlank(bo.getPressure()), GPipelineGasUser::getPressure, bo.getPressure());
+        lqw.eq(StringUtils.isNotBlank(bo.getMixingGases()), GPipelineGasUser::getMixingGases, bo.getMixingGases());
+        lqw.eq(StringUtils.isNotBlank(bo.getHeavyHanging()), GPipelineGasUser::getHeavyHanging, bo.getHeavyHanging());
+        lqw.eq(StringUtils.isNotBlank(bo.getWireTangle()), GPipelineGasUser::getWireTangle, bo.getWireTangle());
+        lqw.eq(StringUtils.isNotBlank(bo.getOther()), GPipelineGasUser::getOther, bo.getOther());
+        lqw.eq(StringUtils.isNotBlank(bo.getSecurityCheckOne()), GPipelineGasUser::getSecurityCheckOne, bo.getSecurityCheckOne());
+        lqw.eq(StringUtils.isNotBlank(bo.getSecurityCheckTwo()), GPipelineGasUser::getSecurityCheckTwo, bo.getSecurityCheckTwo());
+        lqw.eq(StringUtils.isNotBlank(bo.getSecurityCheckUser()), GPipelineGasUser::getSecurityCheckUser, bo.getSecurityCheckUser());
+        lqw.eq(bo.getSecurityCheckTime() != null, GPipelineGasUser::getSecurityCheckTime, bo.getSecurityCheckTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getRepresentative()), GPipelineGasUser::getRepresentative, bo.getRepresentative());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), GPipelineGasUser::getPhone, bo.getPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getFlammableMaterialsLabel()), GPipelineGasUser::getFlammableMaterialsLabel, bo.getFlammableMaterialsLabel());
+        lqw.eq(StringUtils.isNotBlank(bo.getPressureLabel()), GPipelineGasUser::getPressureLabel, bo.getPressureLabel());
+        lqw.eq(StringUtils.isNotBlank(bo.getMixingGasesLabel()), GPipelineGasUser::getMixingGasesLabel, bo.getMixingGasesLabel());
+        lqw.eq(StringUtils.isNotBlank(bo.getHeavyHangingLabel()), GPipelineGasUser::getHeavyHangingLabel, bo.getHeavyHangingLabel());
+        lqw.eq(StringUtils.isNotBlank(bo.getWireTangleLabel()), GPipelineGasUser::getWireTangleLabel, bo.getWireTangleLabel());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GPipelineGasUserBo bo) {
+        GPipelineGasUser add = BeanUtil.toBean(bo, GPipelineGasUser.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GPipelineGasUserBo bo) {
+        GPipelineGasUser update = BeanUtil.toBean(bo, GPipelineGasUser.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GPipelineGasUser entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}

+ 54 - 0
ruoyi-gas/src/main/resources/mapper/GPipelineGasUserMapper.xml

@@ -0,0 +1,54 @@
+<?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.gas.mapper.GPipelineGasUserMapper">
+
+    <resultMap type="com.ruoyi.gas.domain.GPipelineGasUser" id="GPipelineGasUserResult">
+        <result property="id" column="id"/>
+        <result property="userName" column="user_name"/>
+        <result property="userNumber" column="user_number"/>
+        <result property="userType" column="user_type"/>
+        <result property="valveAppearance" column="valve_appearance"/>
+        <result property="sensitives" column="sensitives"/>
+        <result property="type" column="type"/>
+        <result property="cabinetAppearance" column="cabinet_appearance"/>
+        <result property="boilerAppearance" column="boiler_appearance"/>
+        <result property="boilerExterior" column="boiler_exterior"/>
+        <result property="pipeline" column="pipeline"/>
+        <result property="measuringInstruments" column="measuring_instruments"/>
+        <result property="cateringStatus" column="catering_status"/>
+        <result property="cateringExterior" column="catering_exterior"/>
+        <result property="connectingPipeB" column="connecting_pipe_b"/>
+        <result property="connectingPipe" column="connecting_pipe"/>
+        <result property="condensateBar" column="condensate_bar"/>
+        <result property="receptionModification" column="reception_modification"/>
+        <result property="pressureStatus" column="pressure_status"/>
+        <result property="combustibleGas" column="combustible_gas"/>
+        <result property="combustibleGasB" column="combustible_gas_b"/>
+        <result property="emergencyShut" column="emergency_shut"/>
+        <result property="emergencyShutB" column="emergency_shut_b"/>
+        <result property="safetyValve" column="safety_valve"/>
+        <result property="flowDirectionLabel" column="flow_direction_label"/>
+        <result property="flowDirection" column="flow_direction"/>
+        <result property="flammableMaterials" column="flammable_materials"/>
+        <result property="pressure" column="pressure"/>
+        <result property="mixingGases" column="mixing_gases"/>
+        <result property="heavyHanging" column="heavy_hanging"/>
+        <result property="wireTangle" column="wire_tangle"/>
+        <result property="other" column="other"/>
+        <result property="securityCheckOne" column="security_check_one"/>
+        <result property="securityCheckTwo" column="security_check_two"/>
+        <result property="securityCheckUser" column="security_check_user"/>
+        <result property="securityCheckTime" column="security_check_time"/>
+        <result property="representative" column="representative"/>
+        <result property="phone" column="phone"/>
+        <result property="flammableMaterialsLabel" column="flammable_materials_label"/>
+        <result property="pressureLabel" column="pressure_label"/>
+        <result property="mixingGasesLabel" column="mixing_gases_label"/>
+        <result property="heavyHangingLabel" column="heavy_hanging_label"/>
+        <result property="wireTangleLabel" column="wire_tangle_label"/>
+    </resultMap>
+
+
+</mapper>