台账管理

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/standingBook/THiddenDangerStandingBookController.java

+package com.zehong.web.controller.standingBook;
+
+import java.util.List;
+
+import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.THiddenDangerStandingBook;
+import com.zehong.system.service.ITHiddenDangerStandingBookService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 隐患整治台账Controller
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+@RestController
+@RequestMapping("/standingBook/hidden")
+public class THiddenDangerStandingBookController extends BaseController
+{
+    @Autowired
+    private ITHiddenDangerStandingBookService tHiddenDangerStandingBookService;
+
+    /**
+     * 查询隐患整治台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:hidden:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(THiddenDangerStandingBookForm tHiddenDangerStandingBook)
+    {
+        startPage();
+        List<THiddenDangerStandingBook> list = tHiddenDangerStandingBookService.selectTHiddenDangerStandingBookList(tHiddenDangerStandingBook);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出隐患整治台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:hidden:export')")
+    @Log(title = "隐患整治台账", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(THiddenDangerStandingBookForm tHiddenDangerStandingBook)
+    {
+        List<THiddenDangerStandingBook> list = tHiddenDangerStandingBookService.selectTHiddenDangerStandingBookList(tHiddenDangerStandingBook);
+        ExcelUtil<THiddenDangerStandingBook> util = new ExcelUtil<THiddenDangerStandingBook>(THiddenDangerStandingBook.class);
+        return util.exportExcel(list, "隐患整治台账数据");
+    }
+
+    /**
+     * 获取隐患整治台账详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:hidden:query')")
+    @GetMapping(value = "/{hiddenId}")
+    public AjaxResult getInfo(@PathVariable("hiddenId") Long hiddenId)
+    {
+        return AjaxResult.success(tHiddenDangerStandingBookService.selectTHiddenDangerStandingBookById(hiddenId));
+    }
+
+    /**
+     * 新增隐患整治台账
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:hidden:add')")
+    @Log(title = "隐患整治台账", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody THiddenDangerStandingBook tHiddenDangerStandingBook)
+    {
+        return toAjax(tHiddenDangerStandingBookService.insertTHiddenDangerStandingBook(tHiddenDangerStandingBook));
+    }
+
+    /**
+     * 修改隐患整治台账
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:hidden:edit')")
+    @Log(title = "隐患整治台账", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody THiddenDangerStandingBook tHiddenDangerStandingBook)
+    {
+        return toAjax(tHiddenDangerStandingBookService.updateTHiddenDangerStandingBook(tHiddenDangerStandingBook));
+    }
+
+    /**
+     * 删除隐患整治台账
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:hidden:remove')")
+    @Log(title = "隐患整治台账", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{hiddenIds}")
+    public AjaxResult remove(@PathVariable Long[] hiddenIds)
+    {
+        return toAjax(tHiddenDangerStandingBookService.deleteTHiddenDangerStandingBookByIds(hiddenIds));
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/standingBook/TSafeEquipmentStandingBookController.java

+package com.zehong.web.controller.standingBook;
+
+import java.util.List;
+
+import com.zehong.system.domain.form.TSafeEquipmentStandingBookForm;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TSafeEquipmentStandingBook;
+import com.zehong.system.service.ITSafeEquipmentStandingBookService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 用户加装安全装置台账Controller
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+@RestController
+@RequestMapping("/standingBook/equipment")
+public class TSafeEquipmentStandingBookController extends BaseController
+{
+    @Autowired
+    private ITSafeEquipmentStandingBookService tSafeEquipmentStandingBookService;
+
+    /**
+     * 查询用户加装安全装置台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:equipment:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TSafeEquipmentStandingBookForm tSafeEquipmentStandingBook)
+    {
+        startPage();
+        List<TSafeEquipmentStandingBook> list = tSafeEquipmentStandingBookService.selectTSafeEquipmentStandingBookList(tSafeEquipmentStandingBook);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出用户加装安全装置台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:equipment:export')")
+    @Log(title = "用户加装安全装置台账", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TSafeEquipmentStandingBookForm tSafeEquipmentStandingBook)
+    {
+        List<TSafeEquipmentStandingBook> list = tSafeEquipmentStandingBookService.selectTSafeEquipmentStandingBookList(tSafeEquipmentStandingBook);
+        ExcelUtil<TSafeEquipmentStandingBook> util = new ExcelUtil<TSafeEquipmentStandingBook>(TSafeEquipmentStandingBook.class);
+        return util.exportExcel(list, "用户加装安全装置台账数据");
+    }
+
+    /**
+     * 获取用户加装安全装置台账详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:equipment:query')")
+    @GetMapping(value = "/{safeEquipmentId}")
+    public AjaxResult getInfo(@PathVariable("safeEquipmentId") Long safeEquipmentId)
+    {
+        return AjaxResult.success(tSafeEquipmentStandingBookService.selectTSafeEquipmentStandingBookById(safeEquipmentId));
+    }
+
+    /**
+     * 新增用户加装安全装置台账
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:equipment:add')")
+    @Log(title = "用户加装安全装置台账", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TSafeEquipmentStandingBook tSafeEquipmentStandingBook)
+    {
+        return toAjax(tSafeEquipmentStandingBookService.insertTSafeEquipmentStandingBook(tSafeEquipmentStandingBook));
+    }
+
+    /**
+     * 修改用户加装安全装置台账
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:equipment:edit')")
+    @Log(title = "用户加装安全装置台账", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TSafeEquipmentStandingBook tSafeEquipmentStandingBook)
+    {
+        return toAjax(tSafeEquipmentStandingBookService.updateTSafeEquipmentStandingBook(tSafeEquipmentStandingBook));
+    }
+
+    /**
+     * 删除用户加装安全装置台账
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:equipment:remove')")
+    @Log(title = "用户加装安全装置台账", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{safeEquipmentIds}")
+    public AjaxResult remove(@PathVariable Long[] safeEquipmentIds)
+    {
+        return toAjax(tSafeEquipmentStandingBookService.deleteTSafeEquipmentStandingBookByIds(safeEquipmentIds));
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/standingBook/TTroubleStandingBookController.java

+package com.zehong.web.controller.standingBook;
+
+import java.util.List;
+
+import com.zehong.system.domain.form.TTroubleStandingBookForm;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TTroubleStandingBook;
+import com.zehong.system.service.ITTroubleStandingBookService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 事故台账Controller
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+@RestController
+@RequestMapping("/standingBook/trouble")
+public class TTroubleStandingBookController extends BaseController
+{
+    @Autowired
+    private ITTroubleStandingBookService tTroubleStandingBookService;
+
+    /**
+     * 查询事故台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:trouble:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TTroubleStandingBookForm tTroubleStandingBook)
+    {
+        startPage();
+        List<TTroubleStandingBook> list = tTroubleStandingBookService.selectTTroubleStandingBookList(tTroubleStandingBook);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出事故台账列表
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:trouble:export')")
+    @Log(title = "事故台账", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TTroubleStandingBookForm tTroubleStandingBook)
+    {
+        List<TTroubleStandingBook> list = tTroubleStandingBookService.selectTTroubleStandingBookList(tTroubleStandingBook);
+        ExcelUtil<TTroubleStandingBook> util = new ExcelUtil<TTroubleStandingBook>(TTroubleStandingBook.class);
+        return util.exportExcel(list, "事故台账数据");
+    }
+
+    /**
+     * 获取事故台账详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:trouble:query')")
+    @GetMapping(value = "/{troubleId}")
+    public AjaxResult getInfo(@PathVariable("troubleId") Long troubleId)
+    {
+        return AjaxResult.success(tTroubleStandingBookService.selectTTroubleStandingBookById(troubleId));
+    }
+
+    /**
+     * 新增事故台账
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:trouble:add')")
+    @Log(title = "事故台账", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TTroubleStandingBook tTroubleStandingBook)
+    {
+        return toAjax(tTroubleStandingBookService.insertTTroubleStandingBook(tTroubleStandingBook));
+    }
+
+    /**
+     * 修改事故台账
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:trouble:edit')")
+    @Log(title = "事故台账", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TTroubleStandingBook tTroubleStandingBook)
+    {
+        return toAjax(tTroubleStandingBookService.updateTTroubleStandingBook(tTroubleStandingBook));
+    }
+
+    /**
+     * 删除事故台账
+     */
+    @PreAuthorize("@ss.hasPermi('standingBook:trouble:remove')")
+    @Log(title = "事故台账", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{troubleIds}")
+    public AjaxResult remove(@PathVariable Long[] troubleIds)
+    {
+        return toAjax(tTroubleStandingBookService.deleteTTroubleStandingBookByIds(troubleIds));
+    }
+}

gassafetyprogress-system/pom.xml

@@ -22,6 +22,10 @@
             <groupId>com.zehong</groupId>
             <artifactId>gassafetyprogress-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
 
     </dependencies>
 

gassafetyprogress-system/src/main/java/com/zehong/system/domain/THiddenDangerStandingBook.java

+package com.zehong.system.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 隐患整治台账对象 t_hidden_danger_standing_book
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+public class THiddenDangerStandingBook extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 隐患id */
+    private Long hiddenId;
+
+    /** 隐患名称 */
+    @Excel(name = "隐患名称")
+    private String hiddenTitle;
+
+    /** 隐患内容 */
+    @Excel(name = "隐患内容")
+    private String hiddenContent;
+
+    /** 隐患位置 */
+    @Excel(name = "隐患位置")
+    private String hiddenLocation;
+
+    /** 经度 */
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    private BigDecimal latitude;
+
+    /** 隐患类型 */
+    @Excel(name = "隐患类型")
+    private String hiddenType;
+
+    /** 隐患发现人员 */
+    @Excel(name = "隐患发现人员")
+    private String hiddenFindPeople;
+
+    /** 发现时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "发现时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date hiddenFindDate;
+
+    /** 处理方案 */
+    @Excel(name = "处理方案")
+    private String dealPlan;
+
+    /** 整治情况 */
+    @Excel(name = "整治情况")
+    private String remediation;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setHiddenId(Long hiddenId) 
+    {
+        this.hiddenId = hiddenId;
+    }
+
+    public Long getHiddenId() 
+    {
+        return hiddenId;
+    }
+    public void setHiddenTitle(String hiddenTitle) 
+    {
+        this.hiddenTitle = hiddenTitle;
+    }
+
+    public String getHiddenTitle() 
+    {
+        return hiddenTitle;
+    }
+    public void setHiddenContent(String hiddenContent) 
+    {
+        this.hiddenContent = hiddenContent;
+    }
+
+    public String getHiddenContent() 
+    {
+        return hiddenContent;
+    }
+    public void setHiddenLocation(String hiddenLocation) 
+    {
+        this.hiddenLocation = hiddenLocation;
+    }
+
+    public String getHiddenLocation() 
+    {
+        return hiddenLocation;
+    }
+
+    public BigDecimal getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(BigDecimal longitude) {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(BigDecimal latitude) {
+        this.latitude = latitude;
+    }
+
+    public void setHiddenType(String hiddenType)
+    {
+        this.hiddenType = hiddenType;
+    }
+
+    public String getHiddenType() 
+    {
+        return hiddenType;
+    }
+    public void setHiddenFindPeople(String hiddenFindPeople) 
+    {
+        this.hiddenFindPeople = hiddenFindPeople;
+    }
+
+    public String getHiddenFindPeople() 
+    {
+        return hiddenFindPeople;
+    }
+    public void setHiddenFindDate(Date hiddenFindDate) 
+    {
+        this.hiddenFindDate = hiddenFindDate;
+    }
+
+    public Date getHiddenFindDate() 
+    {
+        return hiddenFindDate;
+    }
+    public void setDealPlan(String dealPlan) 
+    {
+        this.dealPlan = dealPlan;
+    }
+
+    public String getDealPlan() 
+    {
+        return dealPlan;
+    }
+    public void setRemediation(String remediation) 
+    {
+        this.remediation = remediation;
+    }
+
+    public String getRemediation() 
+    {
+        return remediation;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("hiddenId", getHiddenId())
+            .append("hiddenTitle", getHiddenTitle())
+            .append("hiddenContent", getHiddenContent())
+            .append("hiddenLocation", getHiddenLocation())
+            .append("hiddenType", getHiddenType())
+            .append("hiddenFindPeople", getHiddenFindPeople())
+            .append("hiddenFindDate", getHiddenFindDate())
+            .append("dealPlan", getDealPlan())
+            .append("remediation", getRemediation())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TSafeEquipmentStandingBook.java

+package com.zehong.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 用户加装安全装置台账对象 t_safe_equipment_standing_book
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+public class TSafeEquipmentStandingBook extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 安全装置台账id */
+    private Long safeEquipmentId;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String userName;
+
+    /** 用户编号 */
+    @Excel(name = "用户编号")
+    private String userNo;
+
+    /** 用户详细地址 */
+    @Excel(name = "用户详细地址")
+    private String userAddress;
+
+    /** 身份证号 */
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String linkMobile;
+
+    /** 安装时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date installTime;
+
+    /** 品牌名称 */
+    @Excel(name = "品牌名称")
+    private String brandName;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setSafeEquipmentId(Long safeEquipmentId) 
+    {
+        this.safeEquipmentId = safeEquipmentId;
+    }
+
+    public Long getSafeEquipmentId() 
+    {
+        return safeEquipmentId;
+    }
+    public void setUserName(String userName) 
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName() 
+    {
+        return userName;
+    }
+    public void setUserNo(String userNo)
+    {
+        this.userNo = userNo;
+    }
+
+    public String getUserNo()
+    {
+        return userNo;
+    }
+    public void setUserAddress(String userAddress) 
+    {
+        this.userAddress = userAddress;
+    }
+
+    public String getUserAddress() 
+    {
+        return userAddress;
+    }
+    public void setIdCard(String idCard) 
+    {
+        this.idCard = idCard;
+    }
+
+    public String getIdCard() 
+    {
+        return idCard;
+    }
+    public void setLinkMobile(String linkMobile) 
+    {
+        this.linkMobile = linkMobile;
+    }
+
+    public String getLinkMobile() 
+    {
+        return linkMobile;
+    }
+    public void setInstallTime(Date installTime) 
+    {
+        this.installTime = installTime;
+    }
+
+    public Date getInstallTime() 
+    {
+        return installTime;
+    }
+    public void setBrandName(String brandName) 
+    {
+        this.brandName = brandName;
+    }
+
+    public String getBrandName() 
+    {
+        return brandName;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("safeEquipmentId", getSafeEquipmentId())
+            .append("userName", getUserName())
+            .append("userNo", getUserNo())
+            .append("userAddress", getUserAddress())
+            .append("idCard", getIdCard())
+            .append("linkMobile", getLinkMobile())
+            .append("installTime", getInstallTime())
+            .append("brandName", getBrandName())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TTroubleStandingBook.java

+package com.zehong.system.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 事故台账对象 t_trouble_standing_book
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+public class TTroubleStandingBook extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 事故id */
+    private Long troubleId;
+
+    /** 事故名称 */
+    @Excel(name = "事故名称")
+    private String troubleName;
+
+    /** 事故地点 */
+    @Excel(name = "事故地点")
+    private String troubleLocation;
+
+    /** 经度 */
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    private BigDecimal latitude;
+
+    /** 事故类型：1.生产安全事故 2.非生产安全事故 */
+    @Excel(name = "事故类型：1.生产安全事故 2.非生产安全事故")
+    private String troubleType;
+
+    /** 简要经过 */
+    @Excel(name = "简要经过")
+    private String briefProcess;
+
+    /** 事故原因 */
+    @Excel(name = "事故原因")
+    private String troubleReason;
+
+    /** 责任单位 */
+    @Excel(name = "责任单位")
+    private String responsibleUnit;
+
+    /** 责任人员 */
+    @Excel(name = "责任人员")
+    private String responsiblePeople;
+
+    /** 是否处理：1.已处理 2.未处理 */
+    @Excel(name = "是否处理：1.已处理 2.未处理")
+    private String isDeal;
+
+    /** 处理完成时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "处理完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date dealDate;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setTroubleId(Long troubleId) 
+    {
+        this.troubleId = troubleId;
+    }
+
+    public Long getTroubleId() 
+    {
+        return troubleId;
+    }
+    public void setTroubleName(String troubleName) 
+    {
+        this.troubleName = troubleName;
+    }
+
+    public String getTroubleName() 
+    {
+        return troubleName;
+    }
+    public void setTroubleLocation(String troubleLocation) 
+    {
+        this.troubleLocation = troubleLocation;
+    }
+
+    public String getTroubleLocation() 
+    {
+        return troubleLocation;
+    }
+
+    public BigDecimal getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(BigDecimal longitude) {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(BigDecimal latitude) {
+        this.latitude = latitude;
+    }
+
+    public void setTroubleType(String troubleType)
+    {
+        this.troubleType = troubleType;
+    }
+
+    public String getTroubleType() 
+    {
+        return troubleType;
+    }
+    public void setBriefProcess(String briefProcess) 
+    {
+        this.briefProcess = briefProcess;
+    }
+
+    public String getBriefProcess() 
+    {
+        return briefProcess;
+    }
+    public void setTroubleReason(String troubleReason) 
+    {
+        this.troubleReason = troubleReason;
+    }
+
+    public String getTroubleReason() 
+    {
+        return troubleReason;
+    }
+    public void setResponsibleUnit(String responsibleUnit) 
+    {
+        this.responsibleUnit = responsibleUnit;
+    }
+
+    public String getResponsibleUnit() 
+    {
+        return responsibleUnit;
+    }
+    public void setResponsiblePeople(String responsiblePeople) 
+    {
+        this.responsiblePeople = responsiblePeople;
+    }
+
+    public String getResponsiblePeople() 
+    {
+        return responsiblePeople;
+    }
+    public void setIsDeal(String isDeal) 
+    {
+        this.isDeal = isDeal;
+    }
+
+    public String getIsDeal() 
+    {
+        return isDeal;
+    }
+    public void setDealDate(Date dealDate) 
+    {
+        this.dealDate = dealDate;
+    }
+
+    public Date getDealDate() 
+    {
+        return dealDate;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("troubleId", getTroubleId())
+            .append("troubleName", getTroubleName())
+            .append("troubleLocation", getTroubleLocation())
+            .append("troubleType", getTroubleType())
+            .append("briefProcess", getBriefProcess())
+            .append("troubleReason", getTroubleReason())
+            .append("responsibleUnit", getResponsibleUnit())
+            .append("responsiblePeople", getResponsiblePeople())
+            .append("isDeal", getIsDeal())
+            .append("dealDate", getDealDate())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/form/THiddenDangerStandingBookForm.java

+package com.zehong.system.domain.form;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 隐患整治台账对象 t_hidden_danger_standing_book
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+@Data
+public class THiddenDangerStandingBookForm
+{
+
+    /** 隐患名称 */
+    private String hiddenTitle;
+
+    /** 隐患类型 */
+    private String hiddenType;
+
+    /** 发现起始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date hiddenFindDateStart;
+
+    /** 发现截止时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date hiddenFindDateEnd;
+
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/form/TSafeEquipmentStandingBookForm.java

+package com.zehong.system.domain.form;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 用户加装安全装置台账对象 t_safe_equipment_standing_book
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+@Data
+public class TSafeEquipmentStandingBookForm
+{
+
+    /** 用户名称 */
+    private String userName;
+
+    /** 联系电话 */
+    private String linkMobile;
+
+    /** 安装起始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date installTimeStart;
+
+    /** 安装截止时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date installTimeEnd;
+
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/form/TTroubleStandingBookForm.java

+package com.zehong.system.domain.form;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Date;
+
+/**
+ * 事故台账对象 t_trouble_standing_book
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+@Data
+public class TTroubleStandingBookForm
+{
+
+    /** 事故名称 */
+    private String troubleName;
+
+    /** 事故类型：1.生产安全事故 2.非生产安全事故 */
+    private String troubleType;
+
+    /** 是否处理：1.已处理 2.未处理 */
+    private String isDeal;
+
+    /** 处理完成起始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dealDateStart;
+
+    /** 处理完成截止时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date dealDateEnd;
+
+}

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/THiddenDangerStandingBookMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.THiddenDangerStandingBook;
+import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
+
+/**
+ * 隐患整治台账Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+public interface THiddenDangerStandingBookMapper 
+{
+    /**
+     * 查询隐患整治台账
+     * 
+     * @param hiddenId 隐患整治台账ID
+     * @return 隐患整治台账
+     */
+    public THiddenDangerStandingBook selectTHiddenDangerStandingBookById(Long hiddenId);
+
+    /**
+     * 查询隐患整治台账列表
+     * 
+     * @param tHiddenDangerStandingBook 隐患整治台账
+     * @return 隐患整治台账集合
+     */
+    public List<THiddenDangerStandingBook> selectTHiddenDangerStandingBookList(THiddenDangerStandingBookForm tHiddenDangerStandingBook);
+
+    /**
+     * 新增隐患整治台账
+     * 
+     * @param tHiddenDangerStandingBook 隐患整治台账
+     * @return 结果
+     */
+    public int insertTHiddenDangerStandingBook(THiddenDangerStandingBook tHiddenDangerStandingBook);
+
+    /**
+     * 修改隐患整治台账
+     * 
+     * @param tHiddenDangerStandingBook 隐患整治台账
+     * @return 结果
+     */
+    public int updateTHiddenDangerStandingBook(THiddenDangerStandingBook tHiddenDangerStandingBook);
+
+    /**
+     * 删除隐患整治台账
+     * 
+     * @param hiddenId 隐患整治台账ID
+     * @return 结果
+     */
+    public int deleteTHiddenDangerStandingBookById(Long hiddenId);
+
+    /**
+     * 批量删除隐患整治台账
+     * 
+     * @param hiddenIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTHiddenDangerStandingBookByIds(Long[] hiddenIds);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TSafeEquipmentStandingBookMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TSafeEquipmentStandingBook;
+import com.zehong.system.domain.form.TSafeEquipmentStandingBookForm;
+
+/**
+ * 用户加装安全装置台账Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+public interface TSafeEquipmentStandingBookMapper 
+{
+    /**
+     * 查询用户加装安全装置台账
+     * 
+     * @param safeEquipmentId 用户加装安全装置台账ID
+     * @return 用户加装安全装置台账
+     */
+    public TSafeEquipmentStandingBook selectTSafeEquipmentStandingBookById(Long safeEquipmentId);
+
+    /**
+     * 查询用户加装安全装置台账列表
+     * 
+     * @param tSafeEquipmentStandingBook 用户加装安全装置台账
+     * @return 用户加装安全装置台账集合
+     */
+    public List<TSafeEquipmentStandingBook> selectTSafeEquipmentStandingBookList(TSafeEquipmentStandingBookForm tSafeEquipmentStandingBook);
+
+    /**
+     * 新增用户加装安全装置台账
+     * 
+     * @param tSafeEquipmentStandingBook 用户加装安全装置台账
+     * @return 结果
+     */
+    public int insertTSafeEquipmentStandingBook(TSafeEquipmentStandingBook tSafeEquipmentStandingBook);
+
+    /**
+     * 修改用户加装安全装置台账
+     * 
+     * @param tSafeEquipmentStandingBook 用户加装安全装置台账
+     * @return 结果
+     */
+    public int updateTSafeEquipmentStandingBook(TSafeEquipmentStandingBook tSafeEquipmentStandingBook);
+
+    /**
+     * 删除用户加装安全装置台账
+     * 
+     * @param safeEquipmentId 用户加装安全装置台账ID
+     * @return 结果
+     */
+    public int deleteTSafeEquipmentStandingBookById(Long safeEquipmentId);
+
+    /**
+     * 批量删除用户加装安全装置台账
+     * 
+     * @param safeEquipmentIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTSafeEquipmentStandingBookByIds(Long[] safeEquipmentIds);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/TTroubleStandingBookMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TTroubleStandingBook;
+import com.zehong.system.domain.form.TTroubleStandingBookForm;
+
+/**
+ * 事故台账Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+public interface TTroubleStandingBookMapper 
+{
+    /**
+     * 查询事故台账
+     * 
+     * @param troubleId 事故台账ID
+     * @return 事故台账
+     */
+    public TTroubleStandingBook selectTTroubleStandingBookById(Long troubleId);
+
+    /**
+     * 查询事故台账列表
+     * 
+     * @param tTroubleStandingBook 事故台账
+     * @return 事故台账集合
+     */
+    public List<TTroubleStandingBook> selectTTroubleStandingBookList(TTroubleStandingBookForm tTroubleStandingBook);
+
+    /**
+     * 新增事故台账
+     * 
+     * @param tTroubleStandingBook 事故台账
+     * @return 结果
+     */
+    public int insertTTroubleStandingBook(TTroubleStandingBook tTroubleStandingBook);
+
+    /**
+     * 修改事故台账
+     * 
+     * @param tTroubleStandingBook 事故台账
+     * @return 结果
+     */
+    public int updateTTroubleStandingBook(TTroubleStandingBook tTroubleStandingBook);
+
+    /**
+     * 删除事故台账
+     * 
+     * @param troubleId 事故台账ID
+     * @return 结果
+     */
+    public int deleteTTroubleStandingBookById(Long troubleId);
+
+    /**
+     * 批量删除事故台账
+     * 
+     * @param troubleIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTTroubleStandingBookByIds(Long[] troubleIds);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITHiddenDangerStandingBookService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.THiddenDangerStandingBook;
+import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
+
+/**
+ * 隐患整治台账Service接口
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+public interface ITHiddenDangerStandingBookService 
+{
+    /**
+     * 查询隐患整治台账
+     * 
+     * @param hiddenId 隐患整治台账ID
+     * @return 隐患整治台账
+     */
+    public THiddenDangerStandingBook selectTHiddenDangerStandingBookById(Long hiddenId);
+
+    /**
+     * 查询隐患整治台账列表
+     * 
+     * @param tHiddenDangerStandingBook 隐患整治台账
+     * @return 隐患整治台账集合
+     */
+    public List<THiddenDangerStandingBook> selectTHiddenDangerStandingBookList(THiddenDangerStandingBookForm tHiddenDangerStandingBook);
+
+    /**
+     * 新增隐患整治台账
+     * 
+     * @param tHiddenDangerStandingBook 隐患整治台账
+     * @return 结果
+     */
+    public int insertTHiddenDangerStandingBook(THiddenDangerStandingBook tHiddenDangerStandingBook);
+
+    /**
+     * 修改隐患整治台账
+     * 
+     * @param tHiddenDangerStandingBook 隐患整治台账
+     * @return 结果
+     */
+    public int updateTHiddenDangerStandingBook(THiddenDangerStandingBook tHiddenDangerStandingBook);
+
+    /**
+     * 批量删除隐患整治台账
+     * 
+     * @param hiddenIds 需要删除的隐患整治台账ID
+     * @return 结果
+     */
+    public int deleteTHiddenDangerStandingBookByIds(Long[] hiddenIds);
+
+    /**
+     * 删除隐患整治台账信息
+     * 
+     * @param hiddenId 隐患整治台账ID
+     * @return 结果
+     */
+    public int deleteTHiddenDangerStandingBookById(Long hiddenId);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITSafeEquipmentStandingBookService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TSafeEquipmentStandingBook;
+import com.zehong.system.domain.form.TSafeEquipmentStandingBookForm;
+
+/**
+ * 用户加装安全装置台账Service接口
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+public interface ITSafeEquipmentStandingBookService 
+{
+    /**
+     * 查询用户加装安全装置台账
+     * 
+     * @param safeEquipmentId 用户加装安全装置台账ID
+     * @return 用户加装安全装置台账
+     */
+    public TSafeEquipmentStandingBook selectTSafeEquipmentStandingBookById(Long safeEquipmentId);
+
+    /**
+     * 查询用户加装安全装置台账列表
+     * 
+     * @param tSafeEquipmentStandingBook 用户加装安全装置台账
+     * @return 用户加装安全装置台账集合
+     */
+    public List<TSafeEquipmentStandingBook> selectTSafeEquipmentStandingBookList(TSafeEquipmentStandingBookForm tSafeEquipmentStandingBook);
+
+    /**
+     * 新增用户加装安全装置台账
+     * 
+     * @param tSafeEquipmentStandingBook 用户加装安全装置台账
+     * @return 结果
+     */
+    public int insertTSafeEquipmentStandingBook(TSafeEquipmentStandingBook tSafeEquipmentStandingBook);
+
+    /**
+     * 修改用户加装安全装置台账
+     * 
+     * @param tSafeEquipmentStandingBook 用户加装安全装置台账
+     * @return 结果
+     */
+    public int updateTSafeEquipmentStandingBook(TSafeEquipmentStandingBook tSafeEquipmentStandingBook);
+
+    /**
+     * 批量删除用户加装安全装置台账
+     * 
+     * @param safeEquipmentIds 需要删除的用户加装安全装置台账ID
+     * @return 结果
+     */
+    public int deleteTSafeEquipmentStandingBookByIds(Long[] safeEquipmentIds);
+
+    /**
+     * 删除用户加装安全装置台账信息
+     * 
+     * @param safeEquipmentId 用户加装安全装置台账ID
+     * @return 结果
+     */
+    public int deleteTSafeEquipmentStandingBookById(Long safeEquipmentId);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITTroubleStandingBookService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TTroubleStandingBook;
+import com.zehong.system.domain.form.TTroubleStandingBookForm;
+
+/**
+ * 事故台账Service接口
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+public interface ITTroubleStandingBookService 
+{
+    /**
+     * 查询事故台账
+     * 
+     * @param troubleId 事故台账ID
+     * @return 事故台账
+     */
+    public TTroubleStandingBook selectTTroubleStandingBookById(Long troubleId);
+
+    /**
+     * 查询事故台账列表
+     * 
+     * @param tTroubleStandingBook 事故台账
+     * @return 事故台账集合
+     */
+    public List<TTroubleStandingBook> selectTTroubleStandingBookList(TTroubleStandingBookForm tTroubleStandingBook);
+
+    /**
+     * 新增事故台账
+     * 
+     * @param tTroubleStandingBook 事故台账
+     * @return 结果
+     */
+    public int insertTTroubleStandingBook(TTroubleStandingBook tTroubleStandingBook);
+
+    /**
+     * 修改事故台账
+     * 
+     * @param tTroubleStandingBook 事故台账
+     * @return 结果
+     */
+    public int updateTTroubleStandingBook(TTroubleStandingBook tTroubleStandingBook);
+
+    /**
+     * 批量删除事故台账
+     * 
+     * @param troubleIds 需要删除的事故台账ID
+     * @return 结果
+     */
+    public int deleteTTroubleStandingBookByIds(Long[] troubleIds);
+
+    /**
+     * 删除事故台账信息
+     * 
+     * @param troubleId 事故台账ID
+     * @return 结果
+     */
+    public int deleteTTroubleStandingBookById(Long troubleId);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/THiddenDangerStandingBookServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.THiddenDangerStandingBookMapper;
+import com.zehong.system.domain.THiddenDangerStandingBook;
+import com.zehong.system.service.ITHiddenDangerStandingBookService;
+
+/**
+ * 隐患整治台账Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+@Service
+public class THiddenDangerStandingBookServiceImpl implements ITHiddenDangerStandingBookService 
+{
+    @Autowired
+    private THiddenDangerStandingBookMapper tHiddenDangerStandingBookMapper;
+
+    /**
+     * 查询隐患整治台账
+     * 
+     * @param hiddenId 隐患整治台账ID
+     * @return 隐患整治台账
+     */
+    @Override
+    public THiddenDangerStandingBook selectTHiddenDangerStandingBookById(Long hiddenId)
+    {
+        return tHiddenDangerStandingBookMapper.selectTHiddenDangerStandingBookById(hiddenId);
+    }
+
+    /**
+     * 查询隐患整治台账列表
+     * 
+     * @param tHiddenDangerStandingBook 隐患整治台账
+     * @return 隐患整治台账
+     */
+    @Override
+    public List<THiddenDangerStandingBook> selectTHiddenDangerStandingBookList(THiddenDangerStandingBookForm tHiddenDangerStandingBook)
+    {
+        return tHiddenDangerStandingBookMapper.selectTHiddenDangerStandingBookList(tHiddenDangerStandingBook);
+    }
+
+    /**
+     * 新增隐患整治台账
+     * 
+     * @param tHiddenDangerStandingBook 隐患整治台账
+     * @return 结果
+     */
+    @Override
+    public int insertTHiddenDangerStandingBook(THiddenDangerStandingBook tHiddenDangerStandingBook)
+    {
+        tHiddenDangerStandingBook.setCreateTime(DateUtils.getNowDate());
+        return tHiddenDangerStandingBookMapper.insertTHiddenDangerStandingBook(tHiddenDangerStandingBook);
+    }
+
+    /**
+     * 修改隐患整治台账
+     * 
+     * @param tHiddenDangerStandingBook 隐患整治台账
+     * @return 结果
+     */
+    @Override
+    public int updateTHiddenDangerStandingBook(THiddenDangerStandingBook tHiddenDangerStandingBook)
+    {
+        tHiddenDangerStandingBook.setUpdateTime(DateUtils.getNowDate());
+        return tHiddenDangerStandingBookMapper.updateTHiddenDangerStandingBook(tHiddenDangerStandingBook);
+    }
+
+    /**
+     * 批量删除隐患整治台账
+     * 
+     * @param hiddenIds 需要删除的隐患整治台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTHiddenDangerStandingBookByIds(Long[] hiddenIds)
+    {
+        return tHiddenDangerStandingBookMapper.deleteTHiddenDangerStandingBookByIds(hiddenIds);
+    }
+
+    /**
+     * 删除隐患整治台账信息
+     * 
+     * @param hiddenId 隐患整治台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTHiddenDangerStandingBookById(Long hiddenId)
+    {
+        return tHiddenDangerStandingBookMapper.deleteTHiddenDangerStandingBookById(hiddenId);
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TSafeEquipmentStandingBookServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.form.TSafeEquipmentStandingBookForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TSafeEquipmentStandingBookMapper;
+import com.zehong.system.domain.TSafeEquipmentStandingBook;
+import com.zehong.system.service.ITSafeEquipmentStandingBookService;
+
+/**
+ * 用户加装安全装置台账Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+@Service
+public class TSafeEquipmentStandingBookServiceImpl implements ITSafeEquipmentStandingBookService 
+{
+    @Autowired
+    private TSafeEquipmentStandingBookMapper tSafeEquipmentStandingBookMapper;
+
+    /**
+     * 查询用户加装安全装置台账
+     * 
+     * @param safeEquipmentId 用户加装安全装置台账ID
+     * @return 用户加装安全装置台账
+     */
+    @Override
+    public TSafeEquipmentStandingBook selectTSafeEquipmentStandingBookById(Long safeEquipmentId)
+    {
+        return tSafeEquipmentStandingBookMapper.selectTSafeEquipmentStandingBookById(safeEquipmentId);
+    }
+
+    /**
+     * 查询用户加装安全装置台账列表
+     * 
+     * @param tSafeEquipmentStandingBook 用户加装安全装置台账
+     * @return 用户加装安全装置台账
+     */
+    @Override
+    public List<TSafeEquipmentStandingBook> selectTSafeEquipmentStandingBookList(TSafeEquipmentStandingBookForm tSafeEquipmentStandingBook)
+    {
+        return tSafeEquipmentStandingBookMapper.selectTSafeEquipmentStandingBookList(tSafeEquipmentStandingBook);
+    }
+
+    /**
+     * 新增用户加装安全装置台账
+     * 
+     * @param tSafeEquipmentStandingBook 用户加装安全装置台账
+     * @return 结果
+     */
+    @Override
+    public int insertTSafeEquipmentStandingBook(TSafeEquipmentStandingBook tSafeEquipmentStandingBook)
+    {
+        tSafeEquipmentStandingBook.setCreateTime(DateUtils.getNowDate());
+        return tSafeEquipmentStandingBookMapper.insertTSafeEquipmentStandingBook(tSafeEquipmentStandingBook);
+    }
+
+    /**
+     * 修改用户加装安全装置台账
+     * 
+     * @param tSafeEquipmentStandingBook 用户加装安全装置台账
+     * @return 结果
+     */
+    @Override
+    public int updateTSafeEquipmentStandingBook(TSafeEquipmentStandingBook tSafeEquipmentStandingBook)
+    {
+        tSafeEquipmentStandingBook.setUpdateTime(DateUtils.getNowDate());
+        return tSafeEquipmentStandingBookMapper.updateTSafeEquipmentStandingBook(tSafeEquipmentStandingBook);
+    }
+
+    /**
+     * 批量删除用户加装安全装置台账
+     * 
+     * @param safeEquipmentIds 需要删除的用户加装安全装置台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTSafeEquipmentStandingBookByIds(Long[] safeEquipmentIds)
+    {
+        return tSafeEquipmentStandingBookMapper.deleteTSafeEquipmentStandingBookByIds(safeEquipmentIds);
+    }
+
+    /**
+     * 删除用户加装安全装置台账信息
+     * 
+     * @param safeEquipmentId 用户加装安全装置台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTSafeEquipmentStandingBookById(Long safeEquipmentId)
+    {
+        return tSafeEquipmentStandingBookMapper.deleteTSafeEquipmentStandingBookById(safeEquipmentId);
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TTroubleStandingBookServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.form.TTroubleStandingBookForm;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TTroubleStandingBookMapper;
+import com.zehong.system.domain.TTroubleStandingBook;
+import com.zehong.system.service.ITTroubleStandingBookService;
+
+/**
+ * 事故台账Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-02-09
+ */
+@Service
+public class TTroubleStandingBookServiceImpl implements ITTroubleStandingBookService 
+{
+    @Autowired
+    private TTroubleStandingBookMapper tTroubleStandingBookMapper;
+
+    /**
+     * 查询事故台账
+     * 
+     * @param troubleId 事故台账ID
+     * @return 事故台账
+     */
+    @Override
+    public TTroubleStandingBook selectTTroubleStandingBookById(Long troubleId)
+    {
+        return tTroubleStandingBookMapper.selectTTroubleStandingBookById(troubleId);
+    }
+
+    /**
+     * 查询事故台账列表
+     * 
+     * @param tTroubleStandingBook 事故台账
+     * @return 事故台账
+     */
+    @Override
+    public List<TTroubleStandingBook> selectTTroubleStandingBookList(TTroubleStandingBookForm tTroubleStandingBook)
+    {
+        return tTroubleStandingBookMapper.selectTTroubleStandingBookList(tTroubleStandingBook);
+    }
+
+    /**
+     * 新增事故台账
+     * 
+     * @param tTroubleStandingBook 事故台账
+     * @return 结果
+     */
+    @Override
+    public int insertTTroubleStandingBook(TTroubleStandingBook tTroubleStandingBook)
+    {
+        tTroubleStandingBook.setCreateTime(DateUtils.getNowDate());
+        return tTroubleStandingBookMapper.insertTTroubleStandingBook(tTroubleStandingBook);
+    }
+
+    /**
+     * 修改事故台账
+     * 
+     * @param tTroubleStandingBook 事故台账
+     * @return 结果
+     */
+    @Override
+    public int updateTTroubleStandingBook(TTroubleStandingBook tTroubleStandingBook)
+    {
+        tTroubleStandingBook.setUpdateTime(DateUtils.getNowDate());
+        return tTroubleStandingBookMapper.updateTTroubleStandingBook(tTroubleStandingBook);
+    }
+
+    /**
+     * 批量删除事故台账
+     * 
+     * @param troubleIds 需要删除的事故台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTroubleStandingBookByIds(Long[] troubleIds)
+    {
+        return tTroubleStandingBookMapper.deleteTTroubleStandingBookByIds(troubleIds);
+    }
+
+    /**
+     * 删除事故台账信息
+     * 
+     * @param troubleId 事故台账ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTTroubleStandingBookById(Long troubleId)
+    {
+        return tTroubleStandingBookMapper.deleteTTroubleStandingBookById(troubleId);
+    }
+}

gassafetyprogress-system/src/main/resources/mapper/system/THiddenDangerStandingBookMapper.xml

+<?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.zehong.system.mapper.THiddenDangerStandingBookMapper">
+    
+    <resultMap type="THiddenDangerStandingBook" id="THiddenDangerStandingBookResult">
+        <result property="hiddenId"    column="hidden_id"    />
+        <result property="hiddenTitle"    column="hidden_title"    />
+        <result property="hiddenContent"    column="hidden_content"    />
+        <result property="hiddenLocation"    column="hidden_location"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="hiddenType"    column="hidden_type"    />
+        <result property="hiddenFindPeople"    column="hidden_find_people"    />
+        <result property="hiddenFindDate"    column="hidden_find_date"    />
+        <result property="dealPlan"    column="deal_plan"    />
+        <result property="remediation"    column="remediation"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTHiddenDangerStandingBookVo">
+        select hidden_id, hidden_title, hidden_content, hidden_location, longitude, latitude, hidden_type, hidden_find_people, hidden_find_date, deal_plan, remediation, create_by, create_time, update_by, update_time, is_del, remarks from t_hidden_danger_standing_book
+    </sql>
+
+    <select id="selectTHiddenDangerStandingBookList" parameterType="THiddenDangerStandingBookForm" resultMap="THiddenDangerStandingBookResult">
+        <include refid="selectTHiddenDangerStandingBookVo"/>
+        <where>  is_del = '0'
+            <if test="hiddenTitle != null  and hiddenTitle != ''"> and hidden_title like concat('%', #{hiddenTitle}, '%')</if>
+            <if test="hiddenType != null  and hiddenType != ''"> and hidden_type = #{hiddenType}</if>
+            <if test="hiddenFindDateStart != null "> and hidden_find_date &gt;= #{hiddenFindDateStart}</if>
+            <if test="hiddenFindDateEnd != null "> and hidden_find_date &lt;= #{hiddenFindDateEnd}</if>
+        </where>
+    </select>
+    
+    <select id="selectTHiddenDangerStandingBookById" parameterType="Long" resultMap="THiddenDangerStandingBookResult">
+        <include refid="selectTHiddenDangerStandingBookVo"/>
+        where hidden_id = #{hiddenId}
+    </select>
+        
+    <insert id="insertTHiddenDangerStandingBook" parameterType="THiddenDangerStandingBook" useGeneratedKeys="true" keyProperty="hiddenId">
+        insert into t_hidden_danger_standing_book
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="hiddenTitle != null">hidden_title,</if>
+            <if test="hiddenContent != null">hidden_content,</if>
+            <if test="hiddenLocation != null">hidden_location,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="hiddenType != null">hidden_type,</if>
+            <if test="hiddenFindPeople != null">hidden_find_people,</if>
+            <if test="hiddenFindDate != null">hidden_find_date,</if>
+            <if test="dealPlan != null">deal_plan,</if>
+            <if test="remediation != null">remediation,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="hiddenTitle != null">#{hiddenTitle},</if>
+            <if test="hiddenContent != null">#{hiddenContent},</if>
+            <if test="hiddenLocation != null">#{hiddenLocation},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="hiddenType != null">#{hiddenType},</if>
+            <if test="hiddenFindPeople != null">#{hiddenFindPeople},</if>
+            <if test="hiddenFindDate != null">#{hiddenFindDate},</if>
+            <if test="dealPlan != null">#{dealPlan},</if>
+            <if test="remediation != null">#{remediation},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTHiddenDangerStandingBook" parameterType="THiddenDangerStandingBook">
+        update t_hidden_danger_standing_book
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="hiddenTitle != null">hidden_title = #{hiddenTitle},</if>
+            <if test="hiddenContent != null">hidden_content = #{hiddenContent},</if>
+            <if test="hiddenLocation != null">hidden_location = #{hiddenLocation},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="hiddenType != null">hidden_type = #{hiddenType},</if>
+            <if test="hiddenFindPeople != null">hidden_find_people = #{hiddenFindPeople},</if>
+            <if test="hiddenFindDate != null">hidden_find_date = #{hiddenFindDate},</if>
+            <if test="dealPlan != null">deal_plan = #{dealPlan},</if>
+            <if test="remediation != null">remediation = #{remediation},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where hidden_id = #{hiddenId}
+    </update>
+
+    <delete id="deleteTHiddenDangerStandingBookById" parameterType="Long">
+        delete from t_hidden_danger_standing_book where hidden_id = #{hiddenId}
+    </delete>
+
+    <delete id="deleteTHiddenDangerStandingBookByIds" parameterType="String">
+        delete from t_hidden_danger_standing_book where hidden_id in 
+        <foreach item="hiddenId" collection="array" open="(" separator="," close=")">
+            #{hiddenId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TSafeEquipmentStandingBookMapper.xml

+<?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.zehong.system.mapper.TSafeEquipmentStandingBookMapper">
+    
+    <resultMap type="TSafeEquipmentStandingBook" id="TSafeEquipmentStandingBookResult">
+        <result property="safeEquipmentId"    column="safe_equipment_id"    />
+        <result property="userName"    column="user_name"    />
+        <result property="userNo"    column="user_no"    />
+        <result property="userAddress"    column="user_address"    />
+        <result property="idCard"    column="id_card"    />
+        <result property="linkMobile"    column="link_mobile"    />
+        <result property="installTime"    column="install_time"    />
+        <result property="brandName"    column="brand_name"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTSafeEquipmentStandingBookVo">
+        select safe_equipment_id, user_name, user_no, user_address, id_card, link_mobile, install_time, brand_name, create_by, create_time, update_by, update_time, is_del, remarks from t_safe_equipment_standing_book
+    </sql>
+
+    <select id="selectTSafeEquipmentStandingBookList" parameterType="TSafeEquipmentStandingBookForm" resultMap="TSafeEquipmentStandingBookResult">
+        <include refid="selectTSafeEquipmentStandingBookVo"/>
+        <where>  is_del = '0'
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+            <if test="linkMobile != null  and linkMobile != ''"> and link_mobile like concat('%', #{linkMobile}, '%')</if>
+            <if test="installTimeStart != null "> and install_time &gt;= #{installTimeStart}</if>
+            <if test="installTimeEnd != null "> and install_time &lt;= #{installTimeEnd}</if>
+        </where>
+    </select>
+    
+    <select id="selectTSafeEquipmentStandingBookById" parameterType="Long" resultMap="TSafeEquipmentStandingBookResult">
+        <include refid="selectTSafeEquipmentStandingBookVo"/>
+        where safe_equipment_id = #{safeEquipmentId}
+    </select>
+        
+    <insert id="insertTSafeEquipmentStandingBook" parameterType="TSafeEquipmentStandingBook" useGeneratedKeys="true" keyProperty="safeEquipmentId">
+        insert into t_safe_equipment_standing_book
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userName != null">user_name,</if>
+            <if test="userNo != null">user_no,</if>
+            <if test="userAddress != null">user_address,</if>
+            <if test="idCard != null">id_card,</if>
+            <if test="linkMobile != null">link_mobile,</if>
+            <if test="installTime != null">install_time,</if>
+            <if test="brandName != null">brand_name,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userName != null">#{userName},</if>
+            <if test="userNo != null">#{userNo},</if>
+            <if test="userAddress != null">#{userAddress},</if>
+            <if test="idCard != null">#{idCard},</if>
+            <if test="linkMobile != null">#{linkMobile},</if>
+            <if test="installTime != null">#{installTime},</if>
+            <if test="brandName != null">#{brandName},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTSafeEquipmentStandingBook" parameterType="TSafeEquipmentStandingBook">
+        update t_safe_equipment_standing_book
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="userNo != null">user_no = #{userNo},</if>
+            <if test="userAddress != null">user_address = #{userAddress},</if>
+            <if test="idCard != null">id_card = #{idCard},</if>
+            <if test="linkMobile != null">link_mobile = #{linkMobile},</if>
+            <if test="installTime != null">install_time = #{installTime},</if>
+            <if test="brandName != null">brand_name = #{brandName},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where safe_equipment_id = #{safeEquipmentId}
+    </update>
+
+    <delete id="deleteTSafeEquipmentStandingBookById" parameterType="Long">
+        delete from t_safe_equipment_standing_book where safe_equipment_id = #{safeEquipmentId}
+    </delete>
+
+    <delete id="deleteTSafeEquipmentStandingBookByIds" parameterType="String">
+        delete from t_safe_equipment_standing_book where safe_equipment_id in 
+        <foreach item="safeEquipmentId" collection="array" open="(" separator="," close=")">
+            #{safeEquipmentId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TTroubleStandingBookMapper.xml

+<?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.zehong.system.mapper.TTroubleStandingBookMapper">
+    
+    <resultMap type="TTroubleStandingBook" id="TTroubleStandingBookResult">
+        <result property="troubleId"    column="trouble_id"    />
+        <result property="troubleName"    column="trouble_name"    />
+        <result property="troubleLocation"    column="trouble_location"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="troubleType"    column="trouble_type"    />
+        <result property="briefProcess"    column="brief_process"    />
+        <result property="troubleReason"    column="trouble_reason"    />
+        <result property="responsibleUnit"    column="responsible_unit"    />
+        <result property="responsiblePeople"    column="responsible_people"    />
+        <result property="isDeal"    column="is_deal"    />
+        <result property="dealDate"    column="deal_date"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTTroubleStandingBookVo">
+        select trouble_id, trouble_name, trouble_location, longitude, latitude, trouble_type, brief_process, trouble_reason, responsible_unit, responsible_people, is_deal, deal_date, create_by, create_time, update_by, update_time, is_del, remarks from t_trouble_standing_book
+    </sql>
+
+    <select id="selectTTroubleStandingBookList" parameterType="TTroubleStandingBookForm" resultMap="TTroubleStandingBookResult">
+        <include refid="selectTTroubleStandingBookVo"/>
+        <where>  is_del = '0'
+            <if test="troubleName != null  and troubleName != ''"> and trouble_name like concat('%', #{troubleName}, '%')</if>
+            <if test="troubleType != null  and troubleType != ''"> and trouble_type = #{troubleType}</if>
+            <if test="isDeal != null  and isDeal != ''"> and is_deal = #{isDeal}</if>
+            <if test="dealDateStart != null "> and deal_date &gt;= #{dealDateStart}</if>
+            <if test="dealDateEnd != null "> and deal_date &lt;= #{dealDateEnd}</if>
+        </where>
+    </select>
+    
+    <select id="selectTTroubleStandingBookById" parameterType="Long" resultMap="TTroubleStandingBookResult">
+        <include refid="selectTTroubleStandingBookVo"/>
+        where trouble_id = #{troubleId}
+    </select>
+        
+    <insert id="insertTTroubleStandingBook" parameterType="TTroubleStandingBook" useGeneratedKeys="true" keyProperty="troubleId">
+        insert into t_trouble_standing_book
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="troubleName != null">trouble_name,</if>
+            <if test="troubleLocation != null">trouble_location,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="troubleType != null">trouble_type,</if>
+            <if test="briefProcess != null">brief_process,</if>
+            <if test="troubleReason != null">trouble_reason,</if>
+            <if test="responsibleUnit != null">responsible_unit,</if>
+            <if test="responsiblePeople != null">responsible_people,</if>
+            <if test="isDeal != null">is_deal,</if>
+            <if test="dealDate != null">deal_date,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="troubleName != null">#{troubleName},</if>
+            <if test="troubleLocation != null">#{troubleLocation},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="troubleType != null">#{troubleType},</if>
+            <if test="briefProcess != null">#{briefProcess},</if>
+            <if test="troubleReason != null">#{troubleReason},</if>
+            <if test="responsibleUnit != null">#{responsibleUnit},</if>
+            <if test="responsiblePeople != null">#{responsiblePeople},</if>
+            <if test="isDeal != null">#{isDeal},</if>
+            <if test="dealDate != null">#{dealDate},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTTroubleStandingBook" parameterType="TTroubleStandingBook">
+        update t_trouble_standing_book
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="troubleName != null">trouble_name = #{troubleName},</if>
+            <if test="troubleLocation != null">trouble_location = #{troubleLocation},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="troubleType != null">trouble_type = #{troubleType},</if>
+            <if test="briefProcess != null">brief_process = #{briefProcess},</if>
+            <if test="troubleReason != null">trouble_reason = #{troubleReason},</if>
+            <if test="responsibleUnit != null">responsible_unit = #{responsibleUnit},</if>
+            <if test="responsiblePeople != null">responsible_people = #{responsiblePeople},</if>
+            <if test="isDeal != null">is_deal = #{isDeal},</if>
+            <if test="dealDate != null">deal_date = #{dealDate},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where trouble_id = #{troubleId}
+    </update>
+
+    <delete id="deleteTTroubleStandingBookById" parameterType="Long">
+        delete from t_trouble_standing_book where trouble_id = #{troubleId}
+    </delete>
+
+    <delete id="deleteTTroubleStandingBookByIds" parameterType="String">
+        delete from t_trouble_standing_book where trouble_id in 
+        <foreach item="troubleId" collection="array" open="(" separator="," close=")">
+            #{troubleId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-web/src/api/standingBook/equipment.js

+import request from '@/utils/request'
+
+// 查询用户加装安全装置台账列表
+export function listEquipment(query) {
+  return request({
+    url: '/standingBook/equipment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询用户加装安全装置台账详细
+export function getEquipment(safeEquipmentId) {
+  return request({
+    url: '/standingBook/equipment/' + safeEquipmentId,
+    method: 'get'
+  })
+}
+
+// 新增用户加装安全装置台账
+export function addEquipment(data) {
+  return request({
+    url: '/standingBook/equipment',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改用户加装安全装置台账
+export function updateEquipment(data) {
+  return request({
+    url: '/standingBook/equipment',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除用户加装安全装置台账
+export function delEquipment(safeEquipmentId) {
+  return request({
+    url: '/standingBook/equipment/' + safeEquipmentId,
+    method: 'delete'
+  })
+}
+
+// 导出用户加装安全装置台账
+export function exportEquipment(query) {
+  return request({
+    url: '/standingBook/equipment/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

gassafetyprogress-web/src/api/standingBook/hidden.js

+import request from '@/utils/request'
+
+// 查询隐患整治台账列表
+export function listHidden(query) {
+  return request({
+    url: '/standingBook/hidden/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询隐患整治台账详细
+export function getHidden(hiddenId) {
+  return request({
+    url: '/standingBook/hidden/' + hiddenId,
+    method: 'get'
+  })
+}
+
+// 新增隐患整治台账
+export function addHidden(data) {
+  return request({
+    url: '/standingBook/hidden',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改隐患整治台账
+export function updateHidden(data) {
+  return request({
+    url: '/standingBook/hidden',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除隐患整治台账
+export function delHidden(hiddenId) {
+  return request({
+    url: '/standingBook/hidden/' + hiddenId,
+    method: 'delete'
+  })
+}
+
+// 导出隐患整治台账
+export function exportHidden(query) {
+  return request({
+    url: '/standingBook/hidden/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

gassafetyprogress-web/src/api/standingBook/trouble.js

+import request from '@/utils/request'
+
+// 查询事故台账列表
+export function listTrouble(query) {
+  return request({
+    url: '/standingBook/trouble/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询事故台账详细
+export function getTrouble(troubleId) {
+  return request({
+    url: '/standingBook/trouble/' + troubleId,
+    method: 'get'
+  })
+}
+
+// 新增事故台账
+export function addTrouble(data) {
+  return request({
+    url: '/standingBook/trouble',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改事故台账
+export function updateTrouble(data) {
+  return request({
+    url: '/standingBook/trouble',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除事故台账
+export function delTrouble(troubleId) {
+  return request({
+    url: '/standingBook/trouble/' + troubleId,
+    method: 'delete'
+  })
+}
+
+// 导出事故台账
+export function exportTrouble(query) {
+  return request({
+    url: '/standingBook/trouble/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

gassafetyprogress-web/src/views/standingBook/equipment/index.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="用户名称" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入用户名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!--<el-form-item label="身份证号" prop="idCard">
+        <el-input
+          v-model="queryParams.idCard"
+          placeholder="请输入身份证号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="联系电话" prop="linkMobile">
+        <el-input
+          v-model="queryParams.linkMobile"
+          placeholder="请输入联系电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="安装时间" prop="installTime">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.installTimeStart"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择起始时间">
+        </el-date-picker><span style="color: #bebfc3"> - </span>
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.installTimeEnd"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择截止时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['standingBook:equipment:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+		  :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['standingBook:equipment:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="equipmentList" >
+      <el-table-column label="台账编号" align="center" prop="safeEquipmentId" width="80px"/>
+      <el-table-column label="用户名称" align="center" prop="userName" width="220px"/>
+      <el-table-column label="身份证号" align="center" prop="idCard"/>
+      <el-table-column label="联系电话" align="center" prop="linkMobile"/>
+      <el-table-column label="详细地址" align="center" prop="userAddress" width="380px"/>
+      <el-table-column label="安装时间" align="center" prop="installTime"/>
+      <el-table-column label="品牌名称" align="center" prop="brandName" width="130px"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['standingBook:equipment:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="showDetail(scope.row)"
+            v-hasPermi="['standingBook:equipment:query']"
+          >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['standingBook:equipment:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改用户加装安全装置台账对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="用户名称" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="用户编号" prop="userNo">
+              <el-input v-model="form.userNo" placeholder="请输入用户编号"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="身份证号" prop="idCard">
+              <el-input v-model="form.idCard" placeholder="请输入身份证号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="linkMobile">
+              <el-input v-model="form.linkMobile" placeholder="请输入联系电话" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="详细地址" prop="userAddress">
+              <el-input type="textarea" v-model="form.userAddress" placeholder="请输入详细地址"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="品牌名称" prop="brandName">
+              <el-input v-model="form.brandName" placeholder="请输入品牌名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装时间" prop="installTime">
+              <el-date-picker clearable size="small"
+                              v-model="form.installTime"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              placeholder="请选择安装时间"
+                              style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="备注信息" prop="remarks">
+              <el-input type="textarea" v-model="form.remarks" placeholder="请输入备注信息" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment, exportEquipment } from "@/api/standingBook/equipment";
+
+export default {
+  name: "Equipment",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户加装安全装置台账表格数据
+      equipmentList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: null,
+        idCard: null,
+        linkMobile: null,
+        installTimeStart: null,
+        installTimeEnd: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        userName: [
+          { required: true, message: "请输入用户名称", trigger: "blur" },
+        ],
+        userAddress: [
+          { required: true, message: "请输入详细地址", trigger: "blur" },
+        ],
+        linkMobile: [
+          { required: true, message: "请输入联系电话", trigger: "blur" },
+          { min: 11, max: 11, message: "长度11位", trigger: "blur" },
+        ],
+        idCard: [
+          { required: true, message: "请输入身份证号", trigger: "blur" },
+          { min: 18, max: 18, message: "长度18位", trigger: "blur" },
+        ],
+        installTime: [
+          { required: true, message: "选择安装时间", trigger: "change" },
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用户加装安全装置台账列表 */
+    getList() {
+      this.loading = true;
+      listEquipment(this.queryParams).then(response => {
+        this.equipmentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        safeEquipmentId: null,
+        userName: null,
+        userNo: null,
+        userAddress: null,
+        idCard: null,
+        linkMobile: null,
+        installTime: null,
+        brandName: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        isDel: null,
+        remarks: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加用户加装安全装置台账";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      getEquipment(row.safeEquipmentId).then(response => {
+        console.log("data",response.data);
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改用户加装安全装置台账";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.safeEquipmentId != null) {
+            updateEquipment(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addEquipment(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      // const safeEquipmentIds = row.safeEquipmentId || this.ids;
+      row.isDel = "1";
+      this.$confirm('是否确认删除"' + row.userName + '"的台账?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return updateEquipment(row);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有用户加装安全装置台账数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportEquipment(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    },
+    /** 详细信息跳转 */
+    showDetail(row) {
+      this.$router.push({
+        path: '/standingBook/equipmentDetail',
+        query: {
+          safeEquipmentId: row.safeEquipmentId
+        }
+      })
+    },
+  }
+};
+</script>

gassafetyprogress-web/src/views/standingBook/equipmentDetail/index.vue

+<template>
+  <div class="app-container">
+      <!--<el-row>
+        <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
+          <div style="height: 45px;" @click="$router.go(-1)">
+            <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
+            </el-button>
+          </div>
+        </el-col>
+      </el-row>-->
+      <el-row style="width: 100%;height: 40px;">
+        <el-col :span="24">
+          <div style="">
+            <ul>
+              <li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">燃气用户加装安全装置台账详情</li>
+            </ul>
+          </div>
+        </el-col>
+      </el-row>
+
+      <el-row style="width: 100%;padding: 20px;">
+        <el-form ref="form" v-model="form" label-width="100px" style="width: 100%;">
+          <el-row>
+            <el-form-item label="台账编号:" prop="safeEquipmentId">
+              <font>{{form.safeEquipmentId}}</font>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="用户名称:" prop="userName">
+                <font>{{form.userName}}</font>
+              </el-form-item>
+              <el-form-item label="身份证号:" prop="idCard">
+                <font>{{form.idCard}}</font>
+              </el-form-item>
+              <el-form-item label="品牌名称:" prop="brandName">
+                <font v-if="form.brandName != '' && form.brandName != null">{{form.brandName}}</font>
+                <font v-else> - </font>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="用户编号:" prop="userNo">
+                <font v-if="form.userNo != '' && form.userNo != null">{{form.userNo}}</font>
+                <font v-else> - </font>
+              </el-form-item>
+              <el-form-item label="联系电话:" prop="linkMobile">
+                <font>{{form.linkMobile}}</font>
+              </el-form-item>
+              <el-form-item label="安装时间:" prop="installTime">
+                <font>{{form.installTime}}</font>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-form-item label="详细地址:" prop="userAddress">
+              <font>{{form.userAddress}}</font>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item label="备注信息:" prop="remarks">
+              <font v-if="form.remarks != '' && form.remarks != null">{{form.remarks}}</font>
+              <font v-else> - </font>
+            </el-form-item>
+          </el-row>
+        </el-form>
+      </el-row>
+
+    </div>
+</template>
+
+<script>
+  import { getEquipment } from "@/api/standingBook/equipment";
+
+  export default {
+    name: "equipmentDetail",
+    components: {
+    },
+    data() {
+      return {
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+        }
+      };
+    },
+    created() {
+      // 如果是跳转来的，则接受初始化参数
+      this.safeEquipmentId = this.$route.query.safeEquipmentId;
+    },
+    mounted() {
+      this.getDetail();
+    },
+    methods: {
+      getDetail() {
+        getEquipment(this.safeEquipmentId).then(response => {
+          this.form = response.data;
+          console.log(this.form, "this.form")
+          const obj =this.form;
+        });
+      },
+    }
+  }
+</script>

gassafetyprogress-web/src/views/standingBook/hidden/index.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="隐患名称" prop="hiddenTitle">
+        <el-input
+          v-model="queryParams.hiddenTitle"
+          placeholder="请输入隐患名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="隐患类型" prop="hiddenType">
+        <el-select v-model="queryParams.hiddenType" placeholder="请选择隐患类型" clearable size="small">
+          <el-option
+            v-for="dict in typeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发现时间" prop="hiddenFindDate">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.hiddenFindDateStart"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择起始时间">
+        </el-date-picker><span style="color: #bebfc3"> - </span>
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.hiddenFindDateEnd"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择截止时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['standingBook:hidden:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+		  :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['standingBook:hidden:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="hiddenList" >
+      <el-table-column label="台账编号" align="center" prop="hiddenId" width="80px"/>
+      <el-table-column label="隐患名称" align="center" prop="hiddenTitle" />
+      <el-table-column label="隐患位置" align="center" prop="hiddenLocation" />
+      <el-table-column label="隐患类型" align="center" prop="hiddenType" />
+      <el-table-column label="隐患发现人员" align="center" prop="hiddenFindPeople" />
+      <el-table-column label="发现时间" align="center" prop="hiddenFindDate" width="180px">
+        <template slot-scope="scope">
+          <span>{{ scope.row.hiddenFindDate }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="处理方案" align="center" prop="dealPlan" >
+        <template slot-scope="scope">
+          <span
+            class="dbtn sd qiCr"
+            @click="checkFile(scope.row.dealPlan)"
+            v-if="scope.row.dealPlan != ''"
+          >
+            <i class="el-icon el-icon-view"></i>查看/下载
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="整治情况" align="center" prop="remediation" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['standingBook:hidden:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="showDetail(scope.row)"
+            v-hasPermi="['standingBook:hidden:query']"
+          >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['standingBook:hidden:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改隐患整治台账对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="隐患名称" prop="hiddenTitle">
+              <el-input v-model="form.hiddenTitle" placeholder="请输入隐患名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="隐患类型" prop="hiddenType">
+              <el-select v-model="form.hiddenType" placeholder="请选择隐患类型" style="width: 100%">
+                <el-option
+                  v-for="dict in typeOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="隐患内容" prop="hiddenContent">
+              <editor v-model="form.hiddenContent" :min-height="192"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="隐患位置" prop="hiddenLocation">
+              <el-input v-model="form.hiddenLocation" placeholder="请输入隐患位置" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="经纬度坐标" prop="longitude">
+              <el-row>
+                <el-col :span="9">
+                  <el-input v-model.number="form.longitude" placeholder="请输入经度" />
+                </el-col>
+                <el-col :span="9" style="margin-left: 10px">
+                  <el-input v-model.number="form.latitude" placeholder="请输入纬度"/>
+                </el-col>
+                <el-col :span="3" style="margin-left: 30px">
+                  <el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="隐患发现人员" prop="hiddenFindPeople">
+              <el-input v-model="form.hiddenFindPeople" placeholder="请输入隐患发现人员" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="发现时间" prop="hiddenFindDate">
+              <el-date-picker clearable size="small"
+                              v-model="form.hiddenFindDate"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              placeholder="请选择发现时间"
+                              style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="处理方案" prop="dealPlan">
+              <MyFileUpload
+                listType="picture-card"
+                @resFun="getFileInfo"
+                @remove="listRemove"
+                :fileArr="fileList"
+              />
+              <el-input v-show="false" disabled v-model="form.dealPlan"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="整治情况" prop="remediation">
+              <el-input v-model="form.remediation" placeholder="请输入整治情况" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="备注信息" prop="remarks">
+              <el-input type="textarea" v-model="form.remarks" placeholder="请输入备注信息" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <Mapdialog
+      v-if="loadmap"
+      :dialogTableVisible="dialogTableVisible"
+      @dialogcancelFun="dialogcancelFun"
+      :slat="form.latitude"
+      :slng="form.longitude"
+      @confirmFun="confirmFun($event)"
+    ></Mapdialog>
+
+  </div>
+</template>
+
+<script>
+import { listHidden, getHidden, delHidden, addHidden, updateHidden, exportHidden } from "@/api/standingBook/hidden";
+import Editor from '@/components/Editor';
+import MyFileUpload from '@/components/MyFileUpload';
+
+export default {
+  name: "Hidden",
+  components: {
+    Editor,
+    MyFileUpload
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 隐患整治台账表格数据
+      hiddenList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 隐患类型字典
+      typeOptions: [],
+      // 上传文件列表
+      fileList: [],
+      // 地图
+      loadmap: false,
+      dialogTableVisible: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        hiddenTitle: null,
+        hiddenType: null,
+        hiddenFindDateStart: null,
+        hiddenFindDateEnd: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        hiddenTitle: [
+          { required: true, message: "请输入隐患名称", trigger: "blur" },
+        ],
+        hiddenType: [
+          { required: true, message: "请选择隐患类型", trigger: "blur" },
+        ],
+        hiddenContent: [
+          { required: true, message: "请输入隐患内容", trigger: "blur" },
+        ],
+        hiddenLocation: [
+          { required: true, message: "请输入经纬度", trigger: "blur" },
+        ],
+        longitude: [
+          { required: true, message: "请输入经纬度", trigger: "blur" },
+        ],
+        hiddenFindPeople: [
+          { required: true, message: "请输入隐患发现人员", trigger: "blur" },
+        ],
+        hiddenFindDate: [
+          { required: true, message: "请选择发现时间", trigger: "change" },
+        ],
+        dealPlan: [
+          { required: true, message: "请上传文件", trigger: "change" },
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("t_hidden_type").then(response => {
+      this.typeOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询隐患整治台账列表 */
+    getList() {
+      this.loading = true;
+      listHidden(this.queryParams).then(response => {
+        this.hiddenList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+      this.fileList = [];
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        hiddenId: null,
+        hiddenTitle: null,
+        hiddenContent: null,
+        hiddenLocation: null,
+        hiddenType: null,
+        hiddenFindPeople: null,
+        hiddenFindDate: null,
+        dealPlan: null,
+        remediation: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        isDel: null,
+        remarks: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加隐患整治台账";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const hiddenId = row.hiddenId || this.ids
+      getHidden(hiddenId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改隐患整治台账";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.hiddenId != null) {
+            updateHidden(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addHidden(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      // const hiddenIds = row.hiddenId || this.ids;
+      row.isDel = "1";
+      this.$confirm('是否确认删除"' + row.hiddenTitle + '"的台账?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return updateHidden(row);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有隐患整治台账数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportHidden(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    },
+    /** 详细信息跳转 */
+    showDetail(row) {
+      this.$router.push({
+        path: '/standingBook/hiddenDetail',
+        query: {
+          hiddenId: row.hiddenId
+        }
+      })
+    },
+    checkFile(url) {
+      window.open('http://localhost:8903/gassafety' + url,'_blank')
+      // window.open('http://222.223.203.154:8092/gassafety' + url,'_blank')
+    },
+    getFileInfo(res){
+      this.form.dealPlan = res.url;
+    },
+    listRemove(e) {
+      this.form.dealPlan = "";
+      this.fileList = [];
+    },
+    confirmFun(res) {
+      //确认选择经纬度
+      this.form.longitude = res.lng;
+      this.form.latitude = res.lat;
+    },
+    MapdialogFun() {
+      this.loadmap = true;
+      this.dialogTableVisible = true;
+    },
+    dialogcancelFun() {
+      this.loadmap = false;
+      this.dialogTableVisible = false;
+    },
+  }
+};
+</script>

gassafetyprogress-web/src/views/standingBook/hiddenDetail/index.vue

+<template>
+  <div class="app-container">
+      <!--<el-row>
+        <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
+          <div style="height: 45px;" @click="$router.go(-1)">
+            <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
+            </el-button>
+          </div>
+        </el-col>
+      </el-row>-->
+      <el-row style="width: 100%;height: 40px;">
+        <el-col :span="24">
+          <div style="">
+            <ul>
+              <li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">隐患整治台账详情</li>
+            </ul>
+          </div>
+        </el-col>
+      </el-row>
+
+      <el-row style="width: 100%;padding: 20px;">
+        <el-form ref="form" v-model="form" label-width="100px" style="width: 100%;">
+          <el-row>
+            <el-form-item label="台账编号:" prop="hiddenId">
+              <font>{{form.hiddenId}}</font>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="用户名称:" prop="userName">
+                <font>{{form.userName}}</font>
+              </el-form-item>
+              <el-form-item label="身份证号:" prop="idCard">
+                <font>{{form.idCard}}</font>
+              </el-form-item>
+              <el-form-item label="品牌名称:" prop="brandName">
+                <font v-if="form.brandName != '' && form.brandName != null">{{form.brandName}}</font>
+                <font v-else> - </font>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="用户编号:" prop="userNo">
+                <font v-if="form.userNo != '' && form.userNo != null">{{form.userNo}}</font>
+                <font v-else> - </font>
+              </el-form-item>
+              <el-form-item label="联系电话:" prop="linkMobile">
+                <font>{{form.linkMobile}}</font>
+              </el-form-item>
+              <el-form-item label="安装时间:" prop="installTime">
+                <font>{{form.installTime}}</font>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-form-item label="详细地址:" prop="userAddress">
+              <font>{{form.userAddress}}</font>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item label="备注信息:" prop="remarks">
+              <font v-if="form.remarks != '' && form.remarks != null">{{form.remarks}}</font>
+              <font v-else> - </font>
+            </el-form-item>
+          </el-row>
+        </el-form>
+      </el-row>
+
+    </div>
+</template>
+
+<script>
+  import { getHidden } from "@/api/standingBook/hidden";
+
+  export default {
+    name: "hiddenDetail",
+    components: {
+    },
+    data() {
+      return {
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+        }
+      };
+    },
+    created() {
+      // 如果是跳转来的，则接受初始化参数
+      this.hiddenId = this.$route.query.hiddenId;
+    },
+    mounted() {
+      this.getDetail();
+    },
+    methods: {
+      getDetail() {
+        getHidden(this.hiddenId).then(response => {
+          this.form = response.data;
+          console.log(this.form, "this.form")
+          const obj =this.form;
+        });
+      },
+    }
+  }
+</script>

gassafetyprogress-web/src/views/standingBook/trouble/index.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+      <!--<el-form-item label="事故名称" prop="troubleName">
+        <el-input
+          v-model="queryParams.troubleName"
+          placeholder="请输入事故名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+      <el-form-item label="事故类型" prop="troubleType">
+        <el-select v-model="queryParams.troubleType" placeholder="请选择事故类型" clearable size="small">
+          <el-option
+            v-for="dict in troubleTypeOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="是否处理" prop="isDeal">
+        <el-select v-model="queryParams.isDeal" placeholder="请选择事故类型" clearable size="small">
+          <el-option
+            v-for="dict in isDealOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="处理完成时间" prop="dealDate">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.dealDateStart"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择起始时间">
+        </el-date-picker><span style="color: #bebfc3"> - </span>
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.dealDateEnd"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="请选择截止时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['standingBook:trouble:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+		  :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['standingBook:trouble:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="troubleList" >
+      <el-table-column label="台账编号" align="center" prop="troubleId" width="80px"/>
+      <el-table-column label="事故名称" align="center" prop="troubleName"/>
+      <el-table-column label="事故地点" align="center" prop="troubleLocation"/>
+      <el-table-column label="事故类型" align="center" prop="troubleType" >
+        <template slot-scope="scope">
+          <span v-if="scope.row.troubleType == 1">生产安全事故</span>
+          <span v-if="scope.row.troubleType == 2">非生产安全事故</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="责任单位" align="center" prop="responsibleUnit" />
+      <el-table-column label="责任人员" align="center" prop="responsiblePeople" />
+      <el-table-column label="是否处理" align="center" prop="isDeal" width="120px">
+        <template slot-scope="scope">
+          <span v-if="scope.row.isDeal == 1">已处理</span>
+          <span v-if="scope.row.isDeal == 2">未处理</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="处理完成时间" align="center" prop="dealDate" width="180px"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['standingBook:trouble:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="showDetail(scope.row)"
+            v-hasPermi="['standingBook:trouble:query']"
+          >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['standingBook:trouble:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改事故台账对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="事故名称" prop="troubleName">
+              <el-input v-model="form.troubleName" placeholder="请输入事故名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="事故类型" prop="troubleType">
+              <el-select v-model="form.troubleType" placeholder="请选择事故类型" style="width: 100%">
+                <el-option label="生产安全事故" value="1" />
+                <el-option label="非生产安全事故" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="事故地点" prop="troubleLocation">
+              <el-input v-model="form.troubleLocation" placeholder="请输入事故地点" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="经纬度坐标" prop="longitude">
+              <el-row>
+                <el-col :span="9">
+                  <el-input v-model.number="form.longitude" placeholder="请输入经度" />
+                </el-col>
+                <el-col :span="9" style="margin-left: 10px">
+                  <el-input v-model.number="form.latitude" placeholder="请输入纬度"/>
+                </el-col>
+                <el-col :span="3" style="margin-left: 30px">
+                  <el-button type="primary" plain @click="MapdialogFun">选择经纬度</el-button>
+                </el-col>
+              </el-row>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="事故原因" prop="troubleReason">
+              <el-input type="textarea" v-model="form.troubleReason" placeholder="请输入事故原因" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="简要经过" prop="briefProcess">
+              <el-input type="textarea" v-model="form.briefProcess" placeholder="请输入简要经过" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="责任单位" prop="responsibleUnit">
+              <el-input v-model="form.responsibleUnit" placeholder="请输入责任单位" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="责任人员" prop="responsiblePeople">
+              <el-input v-model="form.responsiblePeople" placeholder="请输入责任人员" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="是否处理" prop="isDeal">
+              <el-select v-model="form.isDeal" placeholder="请选择处理结果">
+                <el-option label="已处理" value="1" />
+                <el-option label="未处理" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="处理完成时间" prop="dealDate">
+              <el-date-picker clearable size="small"
+                              v-model="form.dealDate"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              placeholder="选择处理完成时间"
+                              style="width: 100%">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="23">
+            <el-form-item label="备注信息" prop="remarks">
+              <el-input type="textarea" v-model="form.remarks" placeholder="请输入备注信息" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <Mapdialog
+      v-if="loadmap"
+      :dialogTableVisible="dialogTableVisible"
+      @dialogcancelFun="dialogcancelFun"
+      :slat="form.latitude"
+      :slng="form.longitude"
+      @confirmFun="confirmFun($event)"
+    ></Mapdialog>
+
+  </div>
+</template>
+
+<script>
+import { listTrouble, getTrouble, delTrouble, addTrouble, updateTrouble, exportTrouble } from "@/api/standingBook/trouble";
+
+export default {
+  name: "Trouble",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 事故台账表格数据
+      troubleList: [],
+      // 数据字典类型
+      troubleTypeOptions: [],
+      isDealOptions: [],
+      // 地图
+      loadmap: false,
+      dialogTableVisible: false,
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        troubleName: null,
+        troubleType: null,
+        isDeal: null,
+        dealDateStart: null,
+        dealDateEnd: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        troubleName: [
+          { required: true, message: "请输入事故名称", trigger: "blur" },
+        ],
+        troubleType: [
+          { required: true, message: "请输入事故类型", trigger: "blur" },
+        ],
+        troubleLocation: [
+          { required: true, message: "请输入事故地点", trigger: "blur" },
+        ],
+        longitude: [
+          { required: true, message: "请输入经纬度", trigger: "blur" },
+        ],
+        responsibleUnit: [
+          { required: true, message: "请输入责任单位", trigger: "blur" },
+        ],
+        responsiblePeople: [
+          { required: true, message: "请输入责任人员", trigger: "blur" },
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getDicts("t_trouble_type").then(response => {
+      this.troubleTypeOptions = response.data;
+    });
+    this.getDicts("t_is_deal").then(response => {
+      this.isDealOptions = response.data;
+    });
+  },
+  methods: {
+    /** 查询事故台账列表 */
+    getList() {
+      this.loading = true;
+      listTrouble(this.queryParams).then(response => {
+        this.troubleList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        troubleId: null,
+        troubleName: null,
+        troubleLocation: null,
+        troubleType: null,
+        briefProcess: null,
+        troubleReason: null,
+        responsibleUnit: null,
+        responsiblePeople: null,
+        isDeal: null,
+        dealDate: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        isDel: null,
+        remarks: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加事故台账";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const troubleId = row.troubleId || this.ids
+      getTrouble(troubleId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改事故台账";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.troubleId != null) {
+            updateTrouble(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTrouble(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      // const troubleIds = row.troubleId || this.ids;
+      row.isDel = "1";
+      this.$confirm('是否确认删除"' + row.troubleName + '"的台账?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return updateTrouble(row);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有事故台账数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportTrouble(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    },
+    /** 详细信息跳转 */
+    showDetail(row) {
+      this.$router.push({
+        path: '/standingBook/troubleDetail',
+        query: {
+          troubleId: row.troubleId
+        }
+      })
+    },
+    confirmFun(res) {
+      //确认选择经纬度
+      this.form.longitude = res.lng;
+      this.form.latitude = res.lat;
+    },
+    MapdialogFun() {
+      this.loadmap = true;
+      this.dialogTableVisible = true;
+    },
+    dialogcancelFun() {
+      this.loadmap = false;
+      this.dialogTableVisible = false;
+    },
+  }
+};
+</script>

gassafetyprogress-web/src/views/standingBook/troubleDetail/index.vue

+<template>
+  <div class="app-container">
+      <!--<el-row>
+        <el-col :span="24" style="padding-left: 15px;margin-bottom: -10px;">
+          <div style="height: 45px;" @click="$router.go(-1)">
+            <el-button size="medium" type="text" style="font-size: 18px; color: rgb(7, 63, 112);float: left;">返回
+            </el-button>
+          </div>
+        </el-col>
+      </el-row>-->
+      <el-row style="width: 100%;height: 40px;">
+        <el-col :span="24">
+          <div style="">
+            <ul>
+              <li style="list-style: none;font-weight: 900;font-size: 20px;color: #053b6a;">燃气事故台账详情</li>
+            </ul>
+          </div>
+        </el-col>
+      </el-row>
+
+      <el-row style="width: 100%;padding: 20px;">
+        <el-form ref="form" v-model="form" label-width="100px" style="width: 100%;">
+          <el-row>
+            <el-form-item label="台账编号:" prop="troubleId">
+              <font>{{form.troubleId}}</font>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="用户名称:" prop="userName">
+                <font>{{form.userName}}</font>
+              </el-form-item>
+              <el-form-item label="身份证号:" prop="idCard">
+                <font>{{form.idCard}}</font>
+              </el-form-item>
+              <el-form-item label="品牌名称:" prop="brandName">
+                <font v-if="form.brandName != '' && form.brandName != null">{{form.brandName}}</font>
+                <font v-else> - </font>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="用户编号:" prop="userNo">
+                <font v-if="form.userNo != '' && form.userNo != null">{{form.userNo}}</font>
+                <font v-else> - </font>
+              </el-form-item>
+              <el-form-item label="联系电话:" prop="linkMobile">
+                <font>{{form.linkMobile}}</font>
+              </el-form-item>
+              <el-form-item label="安装时间:" prop="installTime">
+                <font>{{form.installTime}}</font>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-form-item label="详细地址:" prop="userAddress">
+              <font>{{form.userAddress}}</font>
+            </el-form-item>
+          </el-row>
+          <el-row>
+            <el-form-item label="备注信息:" prop="remarks">
+              <font v-if="form.remarks != '' && form.remarks != null">{{form.remarks}}</font>
+              <font v-else> - </font>
+            </el-form-item>
+          </el-row>
+        </el-form>
+      </el-row>
+
+    </div>
+</template>
+
+<script>
+  import { getTrouble } from "@/api/standingBook/trouble";
+
+  export default {
+    name: "troubleDetail",
+    components: {
+    },
+    data() {
+      return {
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        // 表单参数
+        form: {},
+        // 表单校验
+        rules: {
+        }
+      };
+    },
+    created() {
+      // 如果是跳转来的，则接受初始化参数
+      this.troubleId = this.$route.query.troubleId;
+    },
+    mounted() {
+      this.getDetail();
+    },
+    methods: {
+      getDetail() {
+        getTrouble(this.troubleId).then(response => {
+          this.form = response.data;
+          console.log(this.form, "this.form")
+          const obj =this.form;
+        });
+      },
+    }
+  }
+</script>