Merge remote-tracking branch 'origin/master'

gassafetyprogress-framework/src/main/java/com/zehong/framework/config/SecurityConfig.java

@@ -97,7 +97,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/captchaImage").anonymous()
+                .antMatchers("/login", "/captchaImage","/common/upload").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/*.html",

gassafetyprogress-system/src/main/java/com/zehong/system/controller/TEventInfoController.java

+package com.zehong.system.controller;
+
+import java.util.List;
+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.TEventInfo;
+import com.zehong.system.service.ITEventInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 事件处置Controller
+ * 
+ * @author zehong
+ * @date 2022-02-11
+ */
+@RestController
+@RequestMapping("/system/eventInfo")
+public class TEventInfoController extends BaseController
+{
+    @Autowired
+    private ITEventInfoService tEventInfoService;
+
+    /**
+     * 查询事件处置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:eventInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TEventInfo tEventInfo)
+    {
+        startPage();
+        List<TEventInfo> list = tEventInfoService.selectTEventInfoList(tEventInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出事件处置列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:eventInfo:export')")
+    @Log(title = "事件处置", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TEventInfo tEventInfo)
+    {
+        List<TEventInfo> list = tEventInfoService.selectTEventInfoList(tEventInfo);
+        ExcelUtil<TEventInfo> util = new ExcelUtil<TEventInfo>(TEventInfo.class);
+        return util.exportExcel(list, "事件处置数据");
+    }
+
+    /**
+     * 获取事件处置详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:eventInfo:query')")
+    @GetMapping(value = "/{eventId}")
+    public AjaxResult getInfo(@PathVariable("eventId") Long eventId)
+    {
+        return AjaxResult.success(tEventInfoService.selectTEventInfoById(eventId));
+    }
+
+    /**
+     * 新增事件处置
+     */
+    @PreAuthorize("@ss.hasPermi('system:eventInfo:add')")
+    @Log(title = "事件处置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TEventInfo tEventInfo)
+    {
+        return toAjax(tEventInfoService.insertTEventInfo(tEventInfo));
+    }
+
+    /**
+     * 修改事件处置
+     */
+    @PreAuthorize("@ss.hasPermi('system:eventInfo:edit')")
+    @Log(title = "事件处置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TEventInfo tEventInfo)
+    {
+        return toAjax(tEventInfoService.updateTEventInfo(tEventInfo));
+    }
+
+    /**
+     * 删除事件处置
+     */
+    @PreAuthorize("@ss.hasPermi('system:eventInfo:remove')")
+    @Log(title = "事件处置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{eventIds}")
+    public AjaxResult remove(@PathVariable Long[] eventIds)
+    {
+        return toAjax(tEventInfoService.deleteTEventInfoByIds(eventIds));
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/controller/TPlanInfoController.java

+package com.zehong.system.controller;
+
+import java.util.List;
+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.TPlanInfo;
+import com.zehong.system.service.ITPlanInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 应急预案Controller
+ * 
+ * @author zehong
+ * @date 2022-02-11
+ */
+@RestController
+@RequestMapping("/system/planInfo")
+public class TPlanInfoController extends BaseController
+{
+    @Autowired
+    private ITPlanInfoService tPlanInfoService;
+
+    /**
+     * 查询应急预案列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:planInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TPlanInfo tPlanInfo)
+    {
+        startPage();
+        List<TPlanInfo> list = tPlanInfoService.selectTPlanInfoList(tPlanInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出应急预案列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:planInfo:export')")
+    @Log(title = "应急预案", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TPlanInfo tPlanInfo)
+    {
+        List<TPlanInfo> list = tPlanInfoService.selectTPlanInfoList(tPlanInfo);
+        ExcelUtil<TPlanInfo> util = new ExcelUtil<TPlanInfo>(TPlanInfo.class);
+        return util.exportExcel(list, "应急预案数据");
+    }
+
+    /**
+     * 获取应急预案详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:planInfo:query')")
+    @GetMapping(value = "/{planId}")
+    public AjaxResult getInfo(@PathVariable("planId") Long planId)
+    {
+        return AjaxResult.success(tPlanInfoService.selectTPlanInfoById(planId));
+    }
+
+    /**
+     * 新增应急预案
+     */
+    @PreAuthorize("@ss.hasPermi('system:planInfo:add')")
+    @Log(title = "应急预案", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TPlanInfo tPlanInfo)
+    {
+        return toAjax(tPlanInfoService.insertTPlanInfo(tPlanInfo));
+    }
+
+    /**
+     * 修改应急预案
+     */
+    @PreAuthorize("@ss.hasPermi('system:planInfo:edit')")
+    @Log(title = "应急预案", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TPlanInfo tPlanInfo)
+    {
+        return toAjax(tPlanInfoService.updateTPlanInfo(tPlanInfo));
+    }
+
+    /**
+     * 删除应急预案
+     */
+    @PreAuthorize("@ss.hasPermi('system:planInfo:remove')")
+    @Log(title = "应急预案", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{planIds}")
+    public AjaxResult remove(@PathVariable Long[] planIds)
+    {
+        return toAjax(tPlanInfoService.deleteTPlanInfoByIds(planIds));
+    }
+
+    @GetMapping("/getEnterpris")
+    public AjaxResult getEnterpris()
+    {
+        return AjaxResult.success(tPlanInfoService.selectEnterprise());
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEventInfo.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_event_info
+ * 
+ * @author zehong
+ * @date 2022-02-11
+ */
+public class TEventInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 事件id */
+    private Long eventId;
+
+    /** 事件名称 */
+    @Excel(name = "事件名称")
+    private String eventTitle;
+
+    /** 事件类型：1.泄漏 2.火灾 3.爆炸 */
+    @Excel(name = "事件类型：1.泄漏 2.火灾 3.爆炸")
+    private String eventType;
+
+    /** 事件等级 */
+    @Excel(name = "事件等级")
+    private String eventLevel;
+
+    /** 事件地点 */
+    @Excel(name = "事件地点")
+    private String eventLocation;
+
+    /** 报案时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "报案时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reportTime;
+
+    /** 报案人 */
+    @Excel(name = "报案人")
+    private String reportPerson;
+
+    /** 事件处置信息 */
+    @Excel(name = "事件处置信息")
+    private String eventDeal;
+
+    /** 事件评估信息 */
+    @Excel(name = "事件评估信息")
+    private String eventAssessment;
+
+    /** 所属企业 */
+    @Excel(name = "所属企业")
+    private String beyondEnterpriseId;
+
+    /** 所属企业名称 */
+    private String beyondEnterpriseName;
+
+    /** 图片路径 */
+    @Excel(name = "图片路径")
+    private String iconUrl;
+
+    /** 是否删除(0正常，1删除) */
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setEventId(Long eventId) 
+    {
+        this.eventId = eventId;
+    }
+
+    public Long getEventId() 
+    {
+        return eventId;
+    }
+    public void setEventTitle(String eventTitle) 
+    {
+        this.eventTitle = eventTitle;
+    }
+
+    public String getEventTitle() 
+    {
+        return eventTitle;
+    }
+    public void setEventType(String eventType) 
+    {
+        this.eventType = eventType;
+    }
+
+    public String getEventType() 
+    {
+        return eventType;
+    }
+    public void setEventLevel(String eventLevel) 
+    {
+        this.eventLevel = eventLevel;
+    }
+
+    public String getEventLevel() 
+    {
+        return eventLevel;
+    }
+    public void setEventLocation(String eventLocation) 
+    {
+        this.eventLocation = eventLocation;
+    }
+
+    public String getEventLocation() 
+    {
+        return eventLocation;
+    }
+    public void setReportTime(Date reportTime) 
+    {
+        this.reportTime = reportTime;
+    }
+
+    public Date getReportTime() 
+    {
+        return reportTime;
+    }
+    public void setReportPerson(String reportPerson) 
+    {
+        this.reportPerson = reportPerson;
+    }
+
+    public String getReportPerson() 
+    {
+        return reportPerson;
+    }
+    public void setEventDeal(String eventDeal) 
+    {
+        this.eventDeal = eventDeal;
+    }
+
+    public String getEventDeal() 
+    {
+        return eventDeal;
+    }
+    public void setEventAssessment(String eventAssessment) 
+    {
+        this.eventAssessment = eventAssessment;
+    }
+
+    public String getEventAssessment() 
+    {
+        return eventAssessment;
+    }
+    public void setBeyondEnterpriseId(String beyondEnterpriseId) 
+    {
+        this.beyondEnterpriseId = beyondEnterpriseId;
+    }
+
+    public String getBeyondEnterpriseId() 
+    {
+        return beyondEnterpriseId;
+    }
+    public void setBeyondEnterpriseName(String beyondEnterpriseName) 
+    {
+        this.beyondEnterpriseName = beyondEnterpriseName;
+    }
+
+    public String getBeyondEnterpriseName() 
+    {
+        return beyondEnterpriseName;
+    }
+    public void setIconUrl(String iconUrl) 
+    {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconUrl() 
+    {
+        return iconUrl;
+    }
+    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("eventId", getEventId())
+            .append("eventTitle", getEventTitle())
+            .append("eventType", getEventType())
+            .append("eventLevel", getEventLevel())
+            .append("eventLocation", getEventLocation())
+            .append("reportTime", getReportTime())
+            .append("reportPerson", getReportPerson())
+            .append("eventDeal", getEventDeal())
+            .append("eventAssessment", getEventAssessment())
+            .append("beyondEnterpriseId", getBeyondEnterpriseId())
+            .append("beyondEnterpriseName", getBeyondEnterpriseName())
+            .append("iconUrl", getIconUrl())
+            .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/TPlanInfo.java

+package com.zehong.system.domain;
+
+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_plan_info
+ * 
+ * @author zehong
+ * @date 2022-02-11
+ */
+public class TPlanInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 预案id */
+    private Long planId;
+
+    /** 预案标题 */
+    @Excel(name = "预案标题")
+    private String planTitle;
+
+    /** 预案类型 */
+    @Excel(name = "预案类型")
+    private String planType;
+
+    /** 预案等级 */
+    @Excel(name = "预案等级")
+    private String planLevel;
+
+    /** 所属企业 */
+    private String beyondEnterpriseId;
+
+    /** 所属企业名称 */
+    @Excel(name = "所属企业名称")
+    private String beyondEnterpriseName;
+
+    /** 应急方案 */
+    @Excel(name = "应急方案")
+    private String planContents;
+
+    /** 应急设备及车辆 */
+    @Excel(name = "应急设备及车辆")
+    private String planEquipment;
+
+    /** 图片路径 */
+    private String iconUrl;
+
+    /** 是否删除(0正常，1删除) */
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setPlanId(Long planId) 
+    {
+        this.planId = planId;
+    }
+
+    public Long getPlanId() 
+    {
+        return planId;
+    }
+    public void setPlanTitle(String planTitle) 
+    {
+        this.planTitle = planTitle;
+    }
+
+    public String getPlanTitle() 
+    {
+        return planTitle;
+    }
+    public void setPlanType(String planType) 
+    {
+        this.planType = planType;
+    }
+
+    public String getPlanType() 
+    {
+        return planType;
+    }
+    public void setPlanLevel(String planLevel) 
+    {
+        this.planLevel = planLevel;
+    }
+
+    public String getPlanLevel() 
+    {
+        return planLevel;
+    }
+    public void setBeyondEnterpriseId(String beyondEnterpriseId) 
+    {
+        this.beyondEnterpriseId = beyondEnterpriseId;
+    }
+
+    public String getBeyondEnterpriseId() 
+    {
+        return beyondEnterpriseId;
+    }
+    public void setBeyondEnterpriseName(String beyondEnterpriseName) 
+    {
+        this.beyondEnterpriseName = beyondEnterpriseName;
+    }
+
+    public String getBeyondEnterpriseName() 
+    {
+        return beyondEnterpriseName;
+    }
+    public void setPlanContents(String planContents) 
+    {
+        this.planContents = planContents;
+    }
+
+    public String getPlanContents() 
+    {
+        return planContents;
+    }
+    public void setPlanEquipment(String planEquipment) 
+    {
+        this.planEquipment = planEquipment;
+    }
+
+    public String getPlanEquipment() 
+    {
+        return planEquipment;
+    }
+    public void setIconUrl(String iconUrl) 
+    {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconUrl() 
+    {
+        return iconUrl;
+    }
+    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("planId", getPlanId())
+            .append("planTitle", getPlanTitle())
+            .append("planType", getPlanType())
+            .append("planLevel", getPlanLevel())
+            .append("beyondEnterpriseId", getBeyondEnterpriseId())
+            .append("beyondEnterpriseName", getBeyondEnterpriseName())
+            .append("planContents", getPlanContents())
+            .append("planEquipment", getPlanEquipment())
+            .append("iconUrl", getIconUrl())
+            .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/mapper/TEventInfoMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TEventInfo;
+
+/**
+ * 事件处置Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-02-11
+ */
+public interface TEventInfoMapper 
+{
+    /**
+     * 查询事件处置
+     * 
+     * @param eventId 事件处置ID
+     * @return 事件处置
+     */
+    public TEventInfo selectTEventInfoById(Long eventId);
+
+    /**
+     * 查询事件处置列表
+     * 
+     * @param tEventInfo 事件处置
+     * @return 事件处置集合
+     */
+    public List<TEventInfo> selectTEventInfoList(TEventInfo tEventInfo);
+
+    /**
+     * 新增事件处置
+     * 
+     * @param tEventInfo 事件处置
+     * @return 结果
+     */
+    public int insertTEventInfo(TEventInfo tEventInfo);
+
+    /**
+     * 修改事件处置
+     * 
+     * @param tEventInfo 事件处置
+     * @return 结果
+     */
+    public int updateTEventInfo(TEventInfo tEventInfo);
+
+    /**
+     * 删除事件处置
+     * 
+     * @param eventId 事件处置ID
+     * @return 结果
+     */
+    public int deleteTEventInfoById(Long eventId);
+
+    /**
+     * 批量删除事件处置
+     * 
+     * @param eventIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTEventInfoByIds(Long[] eventIds);
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.system.domain.TPlanInfo;
+
+/**
+ * 应急预案Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-02-11
+ */
+public interface TPlanInfoMapper 
+{
+    /**
+     * 查询应急预案
+     * 
+     * @param planId 应急预案ID
+     * @return 应急预案
+     */
+    public TPlanInfo selectTPlanInfoById(Long planId);
+
+    /**
+     * 查询应急预案列表
+     * 
+     * @param tPlanInfo 应急预案
+     * @return 应急预案集合
+     */
+    public List<TPlanInfo> selectTPlanInfoList(TPlanInfo tPlanInfo);
+
+    /**
+     * 新增应急预案
+     * 
+     * @param tPlanInfo 应急预案
+     * @return 结果
+     */
+    public int insertTPlanInfo(TPlanInfo tPlanInfo);
+
+    /**
+     * 修改应急预案
+     * 
+     * @param tPlanInfo 应急预案
+     * @return 结果
+     */
+    public int updateTPlanInfo(TPlanInfo tPlanInfo);
+
+    /**
+     * 删除应急预案
+     * 
+     * @param planId 应急预案ID
+     * @return 结果
+     */
+    public int deleteTPlanInfoById(Long planId);
+
+    /**
+     * 批量删除应急预案
+     * 
+     * @param planIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTPlanInfoByIds(Long[] planIds);
+
+    /**
+     * 公司列表
+     */
+    public List<Map<String,Object>> selectEnterprise();
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TEventInfo;
+
+/**
+ * 事件处置Service接口
+ * 
+ * @author zehong
+ * @date 2022-02-11
+ */
+public interface ITEventInfoService 
+{
+    /**
+     * 查询事件处置
+     * 
+     * @param eventId 事件处置ID
+     * @return 事件处置
+     */
+    public TEventInfo selectTEventInfoById(Long eventId);
+
+    /**
+     * 查询事件处置列表
+     * 
+     * @param tEventInfo 事件处置
+     * @return 事件处置集合
+     */
+    public List<TEventInfo> selectTEventInfoList(TEventInfo tEventInfo);
+
+    /**
+     * 新增事件处置
+     * 
+     * @param tEventInfo 事件处置
+     * @return 结果
+     */
+    public int insertTEventInfo(TEventInfo tEventInfo);
+
+    /**
+     * 修改事件处置
+     * 
+     * @param tEventInfo 事件处置
+     * @return 结果
+     */
+    public int updateTEventInfo(TEventInfo tEventInfo);
+
+    /**
+     * 批量删除事件处置
+     * 
+     * @param eventIds 需要删除的事件处置ID
+     * @return 结果
+     */
+    public int deleteTEventInfoByIds(Long[] eventIds);
+
+    /**
+     * 删除事件处置信息
+     * 
+     * @param eventId 事件处置ID
+     * @return 结果
+     */
+    public int deleteTEventInfoById(Long eventId);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.system.domain.TPlanInfo;
+
+/**
+ * 应急预案Service接口
+ * 
+ * @author zehong
+ * @date 2022-02-11
+ */
+public interface ITPlanInfoService 
+{
+    /**
+     * 查询应急预案
+     * 
+     * @param planId 应急预案ID
+     * @return 应急预案
+     */
+    public TPlanInfo selectTPlanInfoById(Long planId);
+
+    /**
+     * 查询应急预案列表
+     * 
+     * @param tPlanInfo 应急预案
+     * @return 应急预案集合
+     */
+    public List<TPlanInfo> selectTPlanInfoList(TPlanInfo tPlanInfo);
+
+    /**
+     * 新增应急预案
+     * 
+     * @param tPlanInfo 应急预案
+     * @return 结果
+     */
+    public int insertTPlanInfo(TPlanInfo tPlanInfo);
+
+    /**
+     * 修改应急预案
+     * 
+     * @param tPlanInfo 应急预案
+     * @return 结果
+     */
+    public int updateTPlanInfo(TPlanInfo tPlanInfo);
+
+    /**
+     * 批量删除应急预案
+     * 
+     * @param planIds 需要删除的应急预案ID
+     * @return 结果
+     */
+    public int deleteTPlanInfoByIds(Long[] planIds);
+
+    /**
+     * 删除应急预案信息
+     * 
+     * @param planId 应急预案ID
+     * @return 结果
+     */
+    public int deleteTPlanInfoById(Long planId);
+
+    public List<Map<String,Object>> selectEnterprise();
+}

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

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TEventInfoMapper;
+import com.zehong.system.domain.TEventInfo;
+import com.zehong.system.service.ITEventInfoService;
+
+/**
+ * 事件处置Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-02-11
+ */
+@Service
+public class TEventInfoServiceImpl implements ITEventInfoService 
+{
+    @Autowired
+    private TEventInfoMapper tEventInfoMapper;
+
+    /**
+     * 查询事件处置
+     * 
+     * @param eventId 事件处置ID
+     * @return 事件处置
+     */
+    @Override
+    public TEventInfo selectTEventInfoById(Long eventId)
+    {
+        return tEventInfoMapper.selectTEventInfoById(eventId);
+    }
+
+    /**
+     * 查询事件处置列表
+     * 
+     * @param tEventInfo 事件处置
+     * @return 事件处置
+     */
+    @Override
+    public List<TEventInfo> selectTEventInfoList(TEventInfo tEventInfo)
+    {
+        return tEventInfoMapper.selectTEventInfoList(tEventInfo);
+    }
+
+    /**
+     * 新增事件处置
+     * 
+     * @param tEventInfo 事件处置
+     * @return 结果
+     */
+    @Override
+    public int insertTEventInfo(TEventInfo tEventInfo)
+    {
+        tEventInfo.setCreateTime(DateUtils.getNowDate());
+        return tEventInfoMapper.insertTEventInfo(tEventInfo);
+    }
+
+    /**
+     * 修改事件处置
+     * 
+     * @param tEventInfo 事件处置
+     * @return 结果
+     */
+    @Override
+    public int updateTEventInfo(TEventInfo tEventInfo)
+    {
+        tEventInfo.setUpdateTime(DateUtils.getNowDate());
+        return tEventInfoMapper.updateTEventInfo(tEventInfo);
+    }
+
+    /**
+     * 批量删除事件处置
+     * 
+     * @param eventIds 需要删除的事件处置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEventInfoByIds(Long[] eventIds)
+    {
+        return tEventInfoMapper.deleteTEventInfoByIds(eventIds);
+    }
+
+    /**
+     * 删除事件处置信息
+     * 
+     * @param eventId 事件处置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEventInfoById(Long eventId)
+    {
+        return tEventInfoMapper.deleteTEventInfoById(eventId);
+    }
+}

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

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TPlanInfoMapper;
+import com.zehong.system.domain.TPlanInfo;
+import com.zehong.system.service.ITPlanInfoService;
+
+/**
+ * 应急预案Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-02-11
+ */
+@Service
+public class TPlanInfoServiceImpl implements ITPlanInfoService 
+{
+    @Autowired
+    private TPlanInfoMapper tPlanInfoMapper;
+
+    /**
+     * 查询应急预案
+     * 
+     * @param planId 应急预案ID
+     * @return 应急预案
+     */
+    @Override
+    public TPlanInfo selectTPlanInfoById(Long planId)
+    {
+        return tPlanInfoMapper.selectTPlanInfoById(planId);
+    }
+
+    /**
+     * 查询应急预案列表
+     * 
+     * @param tPlanInfo 应急预案
+     * @return 应急预案
+     */
+    @Override
+    public List<TPlanInfo> selectTPlanInfoList(TPlanInfo tPlanInfo)
+    {
+        return tPlanInfoMapper.selectTPlanInfoList(tPlanInfo);
+    }
+
+    /**
+     * 新增应急预案
+     * 
+     * @param tPlanInfo 应急预案
+     * @return 结果
+     */
+    @Override
+    public int insertTPlanInfo(TPlanInfo tPlanInfo)
+    {
+        tPlanInfo.setCreateTime(DateUtils.getNowDate());
+        return tPlanInfoMapper.insertTPlanInfo(tPlanInfo);
+    }
+
+    /**
+     * 修改应急预案
+     * 
+     * @param tPlanInfo 应急预案
+     * @return 结果
+     */
+    @Override
+    public int updateTPlanInfo(TPlanInfo tPlanInfo)
+    {
+        tPlanInfo.setUpdateTime(DateUtils.getNowDate());
+        return tPlanInfoMapper.updateTPlanInfo(tPlanInfo);
+    }
+
+    /**
+     * 批量删除应急预案
+     * 
+     * @param planIds 需要删除的应急预案ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPlanInfoByIds(Long[] planIds)
+    {
+        return tPlanInfoMapper.deleteTPlanInfoByIds(planIds);
+    }
+
+    /**
+     * 删除应急预案信息
+     * 
+     * @param planId 应急预案ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPlanInfoById(Long planId)
+    {
+        return tPlanInfoMapper.deleteTPlanInfoById(planId);
+    }
+
+
+    @Override
+    public List<Map<String,Object>> selectEnterprise(){
+        return tPlanInfoMapper.selectEnterprise();
+    }
+}

gassafetyprogress-system/src/main/resources/mapper/system/TEventInfoMapper.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.TEventInfoMapper">
+    
+    <resultMap type="TEventInfo" id="TEventInfoResult">
+        <result property="eventId"    column="event_id"    />
+        <result property="eventTitle"    column="event_title"    />
+        <result property="eventType"    column="event_type"    />
+        <result property="eventLevel"    column="event_level"    />
+        <result property="eventLocation"    column="event_location"    />
+        <result property="reportTime"    column="report_time"    />
+        <result property="reportPerson"    column="report_person"    />
+        <result property="eventDeal"    column="event_deal"    />
+        <result property="eventAssessment"    column="event_assessment"    />
+        <result property="beyondEnterpriseId"    column="beyond_enterprise_id"    />
+        <result property="beyondEnterpriseName"    column="beyond_enterprise_name"    />
+        <result property="iconUrl"    column="icon_url"    />
+        <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="selectTEventInfoVo">
+        select event_id, event_title, event_type, event_level, event_location, report_time, report_person, event_deal, event_assessment, beyond_enterprise_id, beyond_enterprise_name, icon_url, create_by, create_time, update_by, update_time, is_del, remarks from t_event_info
+    </sql>
+
+    <select id="selectTEventInfoList" parameterType="TEventInfo" resultMap="TEventInfoResult">
+        <include refid="selectTEventInfoVo"/>
+        <where>  
+            <if test="eventTitle != null  and eventTitle != ''"> and event_title like concat('%', #{eventTitle}, '%')</if>
+            <if test="eventType != null  and eventType != ''"> and event_type = #{eventType}</if>
+            <if test="eventLevel != null  and eventLevel != ''"> and event_level = #{eventLevel}</if>
+            <if test="reportPerson != null  and reportPerson != ''"> and report_person like concat('%', #{reportPerson}, '%')</if>
+            <if test="beyondEnterpriseId != null  and beyondEnterpriseId != ''"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
+        </where>
+    </select>
+    
+    <select id="selectTEventInfoById" parameterType="Long" resultMap="TEventInfoResult">
+        <include refid="selectTEventInfoVo"/>
+        where event_id = #{eventId}
+    </select>
+        
+    <insert id="insertTEventInfo" parameterType="TEventInfo" useGeneratedKeys="true" keyProperty="eventId">
+        insert into t_event_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="eventTitle != null">event_title,</if>
+            <if test="eventType != null">event_type,</if>
+            <if test="eventLevel != null">event_level,</if>
+            <if test="eventLocation != null">event_location,</if>
+            <if test="reportTime != null">report_time,</if>
+            <if test="reportPerson != null">report_person,</if>
+            <if test="eventDeal != null">event_deal,</if>
+            <if test="eventAssessment != null">event_assessment,</if>
+            <if test="beyondEnterpriseId != null">beyond_enterprise_id,</if>
+            <if test="beyondEnterpriseName != null">beyond_enterprise_name,</if>
+            <if test="iconUrl != null">icon_url,</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="eventTitle != null">#{eventTitle},</if>
+            <if test="eventType != null">#{eventType},</if>
+            <if test="eventLevel != null">#{eventLevel},</if>
+            <if test="eventLocation != null">#{eventLocation},</if>
+            <if test="reportTime != null">#{reportTime},</if>
+            <if test="reportPerson != null">#{reportPerson},</if>
+            <if test="eventDeal != null">#{eventDeal},</if>
+            <if test="eventAssessment != null">#{eventAssessment},</if>
+            <if test="beyondEnterpriseId != null">#{beyondEnterpriseId},</if>
+            <if test="beyondEnterpriseName != null">#{beyondEnterpriseName},</if>
+            <if test="iconUrl != null">#{iconUrl},</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="updateTEventInfo" parameterType="TEventInfo">
+        update t_event_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="eventTitle != null">event_title = #{eventTitle},</if>
+            <if test="eventType != null">event_type = #{eventType},</if>
+            <if test="eventLevel != null">event_level = #{eventLevel},</if>
+            <if test="eventLocation != null">event_location = #{eventLocation},</if>
+            <if test="reportTime != null">report_time = #{reportTime},</if>
+            <if test="reportPerson != null">report_person = #{reportPerson},</if>
+            <if test="eventDeal != null">event_deal = #{eventDeal},</if>
+            <if test="eventAssessment != null">event_assessment = #{eventAssessment},</if>
+            <if test="beyondEnterpriseId != null">beyond_enterprise_id = #{beyondEnterpriseId},</if>
+            <if test="beyondEnterpriseName != null">beyond_enterprise_name = #{beyondEnterpriseName},</if>
+            <if test="iconUrl != null">icon_url = #{iconUrl},</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 event_id = #{eventId}
+    </update>
+
+    <delete id="deleteTEventInfoById" parameterType="Long">
+        delete from t_event_info where event_id = #{eventId}
+    </delete>
+
+    <delete id="deleteTEventInfoByIds" parameterType="String">
+        delete from t_event_info where event_id in 
+        <foreach item="eventId" collection="array" open="(" separator="," close=")">
+            #{eventId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TPlanInfoMapper.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.TPlanInfoMapper">
+    
+    <resultMap type="TPlanInfo" id="TPlanInfoResult">
+        <result property="planId"    column="plan_id"    />
+        <result property="planTitle"    column="plan_title"    />
+        <result property="planType"    column="plan_type"    />
+        <result property="planLevel"    column="plan_level"    />
+        <result property="beyondEnterpriseId"    column="beyond_enterprise_id"    />
+        <result property="beyondEnterpriseName"    column="beyond_enterprise_name"    />
+        <result property="planContents"    column="plan_contents"    />
+        <result property="planEquipment"    column="plan_equipment"    />
+        <result property="iconUrl"    column="icon_url"    />
+        <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="selectTPlanInfoVo">
+        select plan_id, plan_title, plan_type, plan_level, beyond_enterprise_id, beyond_enterprise_name, plan_contents, plan_equipment, icon_url, create_by, create_time, update_by, update_time, is_del, remarks from t_plan_info
+    </sql>
+
+    <select id="selectTPlanInfoList" parameterType="TPlanInfo" resultMap="TPlanInfoResult">
+        <include refid="selectTPlanInfoVo"/>
+        <where>  
+            <if test="planTitle != null  and planTitle != ''"> and plan_title = #{planTitle}</if>
+            <if test="planType != null  and planType != ''"> and plan_type = #{planType}</if>
+            <if test="planLevel != null  and planLevel != ''"> and plan_level = #{planLevel}</if>
+            <if test="beyondEnterpriseId != null  and beyondEnterpriseId != ''"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
+        </where>
+    </select>
+    
+    <select id="selectTPlanInfoById" parameterType="Long" resultMap="TPlanInfoResult">
+        <include refid="selectTPlanInfoVo"/>
+        where plan_id = #{planId}
+    </select>
+        
+    <insert id="insertTPlanInfo" parameterType="TPlanInfo" useGeneratedKeys="true" keyProperty="planId">
+        insert into t_plan_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="planTitle != null">plan_title,</if>
+            <if test="planType != null">plan_type,</if>
+            <if test="planLevel != null">plan_level,</if>
+            <if test="beyondEnterpriseId != null">beyond_enterprise_id,</if>
+            <if test="beyondEnterpriseName != null">beyond_enterprise_name,</if>
+            <if test="planContents != null">plan_contents,</if>
+            <if test="planEquipment != null">plan_equipment,</if>
+            <if test="iconUrl != null">icon_url,</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="planTitle != null">#{planTitle},</if>
+            <if test="planType != null">#{planType},</if>
+            <if test="planLevel != null">#{planLevel},</if>
+            <if test="beyondEnterpriseId != null">#{beyondEnterpriseId},</if>
+            <if test="beyondEnterpriseName != null">#{beyondEnterpriseName},</if>
+            <if test="planContents != null">#{planContents},</if>
+            <if test="planEquipment != null">#{planEquipment},</if>
+            <if test="iconUrl != null">#{iconUrl},</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="updateTPlanInfo" parameterType="TPlanInfo">
+        update t_plan_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="planTitle != null">plan_title = #{planTitle},</if>
+            <if test="planType != null">plan_type = #{planType},</if>
+            <if test="planLevel != null">plan_level = #{planLevel},</if>
+            <if test="beyondEnterpriseId != null">beyond_enterprise_id = #{beyondEnterpriseId},</if>
+            <if test="beyondEnterpriseName != null">beyond_enterprise_name = #{beyondEnterpriseName},</if>
+            <if test="planContents != null">plan_contents = #{planContents},</if>
+            <if test="planEquipment != null">plan_equipment = #{planEquipment},</if>
+            <if test="iconUrl != null">icon_url = #{iconUrl},</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 plan_id = #{planId}
+    </update>
+
+    <delete id="deleteTPlanInfoById" parameterType="Long">
+        delete from t_plan_info where plan_id = #{planId}
+    </delete>
+
+    <delete id="deleteTPlanInfoByIds" parameterType="String">
+        delete from t_plan_info where plan_id in 
+        <foreach item="planId" collection="array" open="(" separator="," close=")">
+            #{planId}
+        </foreach>
+    </delete>
+    <select id="selectEnterprise" resultType="java.util.HashMap">
+        SELECT enterprise_id as enterpriseId,enterprise_name as enterpriseName FROM t_enterprise_info
+        WHERE is_del = 0
+    </select>
+</mapper>
\ No newline at end of file

gassafetyprogress-web/src/api/system/eventInfo.js

+import request from '@/utils/request'
+
+// 查询事件处置列表
+export function listEventInfo(query) {
+  return request({
+    url: '/system/eventInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+// 公司列表
+export function enterpriseList() {
+  return request({
+    url: '/system/planInfo/getEnterpris',
+    method: 'get'
+  })
+}
+// 查询事件处置详细
+export function getEventInfo(eventId) {
+  return request({
+    url: '/system/eventInfo/' + eventId,
+    method: 'get'
+  })
+}
+
+// 新增事件处置
+export function addEventInfo(data) {
+  return request({
+    url: '/system/eventInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改事件处置
+export function updateEventInfo(data) {
+  return request({
+    url: '/system/eventInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除事件处置
+export function delEventInfo(eventId) {
+  return request({
+    url: '/system/eventInfo/' + eventId,
+    method: 'delete'
+  })
+}
+
+// 导出事件处置
+export function exportEventInfo(query) {
+  return request({
+    url: '/system/eventInfo/export',
+    method: 'get',
+    params: query
+  })
+}

gassafetyprogress-web/src/api/system/planInfo.js

+import request from '@/utils/request'
+
+// 查询应急预案列表
+export function listPlanInfo(query) {
+  return request({
+    url: '/system/planInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询应急预案详细
+export function getPlanInfo(planId) {
+  return request({
+    url: '/system/planInfo/' + planId,
+    method: 'get'
+  })
+}
+// 公司列表
+export function enterpriseList() {
+  return request({
+    url: '/system/planInfo/getEnterpris',
+    method: 'get'
+  })
+}
+// 新增应急预案
+export function addPlanInfo(data) {
+  return request({
+    url: '/system/planInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改应急预案
+export function updatePlanInfo(data) {
+  return request({
+    url: '/system/planInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除应急预案
+export function delPlanInfo(planId) {
+  return request({
+    url: '/system/planInfo/' + planId,
+    method: 'delete'
+  })
+}
+
+// 导出应急预案
+export function exportPlanInfo(query) {
+  return request({
+    url: '/system/planInfo/export',
+    method: 'get',
+    params: query
+  })
+}

gassafetyprogress-web/src/views/system/user/profile/userAvatar.vue

@@ -169,4 +169,4 @@ export default {
   line-height: 110px;
   border-radius: 50%;
 }
-</style>
\ No newline at end of file
+</style>