Merge remote-tracking branch 'origin/master'

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/operationMonitor/TVehicleInfoController.java

+package com.zehong.web.controller.operationMonitor;
+
+import java.util.List;
+
+import com.zehong.system.domain.TVehicleLocationInfo;
+import com.zehong.system.service.ITVehicleLocationInfoService;
+import io.jsonwebtoken.lang.Collections;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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.TVehicleInfo;
+import com.zehong.system.service.ITVehicleInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 燃气车辆信息Controller
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+@RestController
+@RequestMapping("/system/vehicleInfo")
+public class TVehicleInfoController extends BaseController
+{
+    @Autowired
+    private ITVehicleInfoService tVehicleInfoService;
+
+    @Autowired
+    private ITVehicleLocationInfoService itVehicleLocationInfoService;
+
+    /**
+     * 查询燃气车辆信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:vehicleInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TVehicleInfo tVehicleInfo)
+    {
+        startPage();
+        List<TVehicleInfo> list = tVehicleInfoService.selectTVehicleInfoList(tVehicleInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询车辆最终位置
+     * @param vehicleId 车辆信息id
+     * @return
+     */
+    @GetMapping("/getLastLocation")
+    public AjaxResult getLastLocation(@RequestParam(value="vehicleId") Long vehicleId){
+        //获取车辆信息
+        TVehicleInfo tVehicleInfo = tVehicleInfoService.selectTVehicleInfoById(vehicleId);
+        //获取最后位置信息
+        TVehicleLocationInfo tVehicleLocationInfo = new TVehicleLocationInfo();
+        tVehicleLocationInfo.setCarNum(tVehicleInfo.getCarNum());
+        tVehicleLocationInfo.setLast(true);
+        List<TVehicleLocationInfo> tVehicleLocationInfoList=itVehicleLocationInfoService.selectTVehicleLocationInfoList(tVehicleLocationInfo);
+        //车辆最后位置
+        if(!Collections.isEmpty(tVehicleLocationInfoList) && tVehicleLocationInfoList.size() > 0){
+            tVehicleInfo.setLongitude(tVehicleLocationInfoList.get(0).getLongitude());
+            tVehicleInfo.setLatitude(tVehicleLocationInfoList.get(0).getLatitude());
+        }
+        return AjaxResult.success(tVehicleInfo);
+    }
+
+    /**
+     * 导出燃气车辆信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:vehicleInfo:export')")
+    @Log(title = "燃气车辆信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TVehicleInfo tVehicleInfo)
+    {
+        List<TVehicleInfo> list = tVehicleInfoService.selectTVehicleInfoList(tVehicleInfo);
+        ExcelUtil<TVehicleInfo> util = new ExcelUtil<TVehicleInfo>(TVehicleInfo.class);
+        return util.exportExcel(list, "燃气车辆信息数据");
+    }
+
+    /**
+     * 获取燃气车辆信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:vehicleInfo:query')")
+    @GetMapping(value = "/{vehicleId}")
+    public AjaxResult getInfo(@PathVariable("vehicleId") Long vehicleId)
+    {
+        return AjaxResult.success(tVehicleInfoService.selectTVehicleInfoById(vehicleId));
+    }
+
+    /**
+     * 新增燃气车辆信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:vehicleInfo:add')")
+    @Log(title = "燃气车辆信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TVehicleInfo tVehicleInfo)
+    {
+        return toAjax(tVehicleInfoService.insertTVehicleInfo(tVehicleInfo));
+    }
+
+    /**
+     * 修改燃气车辆信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:vehicleInfo:edit')")
+    @Log(title = "燃气车辆信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TVehicleInfo tVehicleInfo)
+    {
+        return toAjax(tVehicleInfoService.updateTVehicleInfo(tVehicleInfo));
+    }
+
+    /**
+     * 删除燃气车辆信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:vehicleInfo:remove')")
+    @Log(title = "燃气车辆信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{vehicleIds}")
+    public AjaxResult remove(@PathVariable Long[] vehicleIds)
+    {
+        return toAjax(tVehicleInfoService.deleteTVehicleInfoByIds(vehicleIds));
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/operationMonitor/TVehicleLocationInfoController.java

+package com.zehong.web.controller.operationMonitor;
+
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.core.page.TableDataInfo;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.system.domain.TVehicleLocationInfo;
+import com.zehong.system.service.ITVehicleLocationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 燃气车辆位置信息Controller
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+@RestController
+@RequestMapping("/system/vehicleLocationInfo")
+public class TVehicleLocationInfoController extends BaseController
+{
+    @Autowired
+    private ITVehicleLocationInfoService tVehicleLocationInfoService;
+
+    /**
+     * 查询燃气车辆位置信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TVehicleLocationInfo tVehicleLocationInfo)
+    {
+        startPage();
+        List<TVehicleLocationInfo> list = tVehicleLocationInfoService.selectTVehicleLocationInfoList(tVehicleLocationInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取车辆位置信息
+     * @param tVehicleLocationInfo
+     * @return
+     */
+    @GetMapping("/getVehicleLocations")
+    public AjaxResult getVehicleLocations(TVehicleLocationInfo tVehicleLocationInfo){
+        return AjaxResult.success( tVehicleLocationInfoService.selectTVehicleLocationInfoList(tVehicleLocationInfo));
+    }
+
+    /**
+     * 导出燃气车辆位置信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:export')")
+    @Log(title = "燃气车辆位置信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TVehicleLocationInfo tVehicleLocationInfo)
+    {
+        List<TVehicleLocationInfo> list = tVehicleLocationInfoService.selectTVehicleLocationInfoList(tVehicleLocationInfo);
+        ExcelUtil<TVehicleLocationInfo> util = new ExcelUtil<TVehicleLocationInfo>(TVehicleLocationInfo.class);
+        return util.exportExcel(list, "燃气车辆位置信息数据");
+    }
+
+    /**
+     * 获取燃气车辆位置信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:query')")
+    @GetMapping(value = "/{vehicleLocationId}")
+    public AjaxResult getInfo(@PathVariable("vehicleLocationId") Long vehicleLocationId)
+    {
+        return AjaxResult.success(tVehicleLocationInfoService.selectTVehicleLocationInfoById(vehicleLocationId));
+    }
+
+    /**
+     * 新增燃气车辆位置信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:add')")
+    @Log(title = "燃气车辆位置信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TVehicleLocationInfo tVehicleLocationInfo)
+    {
+        return toAjax(tVehicleLocationInfoService.insertTVehicleLocationInfo(tVehicleLocationInfo));
+    }
+
+    /**
+     * 修改燃气车辆位置信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:edit')")
+    @Log(title = "燃气车辆位置信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TVehicleLocationInfo tVehicleLocationInfo)
+    {
+        return toAjax(tVehicleLocationInfoService.updateTVehicleLocationInfo(tVehicleLocationInfo));
+    }
+
+    /**
+     * 删除燃气车辆位置信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:vehicleLocationInfo:remove')")
+    @Log(title = "燃气车辆位置信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{vehicleLocationIds}")
+    public AjaxResult remove(@PathVariable Long[] vehicleLocationIds)
+    {
+        return toAjax(tVehicleLocationInfoService.deleteTVehicleLocationInfoByIds(vehicleLocationIds));
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/controller/TEmergencyDeviceController.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.TEmergencyDevice;
+import com.zehong.system.service.ITEmergencyDeviceService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 应急设备Controller
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+@RestController
+@RequestMapping("/system/device")
+public class TEmergencyDeviceController extends BaseController
+{
+    @Autowired
+    private ITEmergencyDeviceService tEmergencyDeviceService;
+
+    /**
+     * 查询应急设备列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TEmergencyDevice tEmergencyDevice)
+    {
+        startPage();
+        List<TEmergencyDevice> list = tEmergencyDeviceService.selectTEmergencyDeviceList(tEmergencyDevice);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出应急设备列表
+     */
+    @Log(title = "应急设备", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TEmergencyDevice tEmergencyDevice)
+    {
+        List<TEmergencyDevice> list = tEmergencyDeviceService.selectTEmergencyDeviceList(tEmergencyDevice);
+        ExcelUtil<TEmergencyDevice> util = new ExcelUtil<TEmergencyDevice>(TEmergencyDevice.class);
+        return util.exportExcel(list, "应急设备数据");
+    }
+
+    /**
+     * 获取应急设备详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(tEmergencyDeviceService.selectTEmergencyDeviceById(id));
+    }
+
+    /**
+     * 新增应急设备
+     */
+    @Log(title = "应急设备", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TEmergencyDevice tEmergencyDevice)
+    {
+        return toAjax(tEmergencyDeviceService.insertTEmergencyDevice(tEmergencyDevice));
+    }
+
+    /**
+     * 修改应急设备
+     */
+    @Log(title = "应急设备", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TEmergencyDevice tEmergencyDevice)
+    {
+        return toAjax(tEmergencyDeviceService.updateTEmergencyDevice(tEmergencyDevice));
+    }
+
+    /**
+     * 删除应急设备
+     */
+    @Log(title = "应急设备", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(tEmergencyDeviceService.deleteTEmergencyDeviceByIds(ids));
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/controller/TEventHandleController.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.TEventHandle;
+import com.zehong.system.service.ITEventHandleService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 事件处置Controller
+ * 
+ * @author zehong
+ * @date 2022-03-19
+ */
+@RestController
+@RequestMapping("/system/handle")
+public class TEventHandleController extends BaseController
+{
+    @Autowired
+    private ITEventHandleService tEventHandleService;
+
+    /**
+     * 查询事件处置列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:handle:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TEventHandle tEventHandle)
+    {
+        startPage();
+        List<TEventHandle> list = tEventHandleService.selectTEventHandleList(tEventHandle);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出事件处置列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:handle:export')")
+    @Log(title = "事件处置", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TEventHandle tEventHandle)
+    {
+        List<TEventHandle> list = tEventHandleService.selectTEventHandleList(tEventHandle);
+        ExcelUtil<TEventHandle> util = new ExcelUtil<TEventHandle>(TEventHandle.class);
+        return util.exportExcel(list, "事件处置数据");
+    }
+
+    /**
+     * 获取事件处置详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:handle:query')")
+    @GetMapping(value = "/{handleId}")
+    public AjaxResult getInfo(@PathVariable("handleId") Long handleId)
+    {
+        return AjaxResult.success(tEventHandleService.selectTEventHandleById(handleId));
+    }
+
+    /**
+     * 新增事件处置
+     */
+    //@PreAuthorize("@ss.hasPermi('system:handle:add')")
+    @Log(title = "事件处置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TEventHandle tEventHandle)
+    {
+        return toAjax(tEventHandleService.insertTEventHandle(tEventHandle));
+    }
+
+    /**
+     * 修改事件处置
+     */
+    //@PreAuthorize("@ss.hasPermi('system:handle:edit')")
+    @Log(title = "事件处置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TEventHandle tEventHandle)
+    {
+        return toAjax(tEventHandleService.updateTEventHandle(tEventHandle));
+    }
+
+    /**
+     * 删除事件处置
+     */
+    //@PreAuthorize("@ss.hasPermi('system:handle:remove')")
+    @Log(title = "事件处置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{handleIds}")
+    public AjaxResult remove(@PathVariable Long[] handleIds)
+    {
+        return toAjax(tEventHandleService.deleteTEventHandleByIds(handleIds));
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/controller/TEventReceiveController.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.TEventReceive;
+import com.zehong.system.service.ITEventReceiveService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 事件接报Controller
+ * 
+ * @author zehong
+ * @date 2022-03-18
+ */
+@RestController
+@RequestMapping("/system/receive")
+public class TEventReceiveController extends BaseController
+{
+    @Autowired
+    private ITEventReceiveService tEventReceiveService;
+
+    /**
+     * 查询事件接报列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:receive:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TEventReceive tEventReceive)
+    {
+        startPage();
+        List<TEventReceive> list = tEventReceiveService.selectTEventReceiveList(tEventReceive);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出事件接报列表
+     */
+    //@PreAuthorize("@ss.hasPermi('system:receive:export')")
+    @Log(title = "事件接报", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TEventReceive tEventReceive)
+    {
+        List<TEventReceive> list = tEventReceiveService.selectTEventReceiveList(tEventReceive);
+        ExcelUtil<TEventReceive> util = new ExcelUtil<TEventReceive>(TEventReceive.class);
+        return util.exportExcel(list, "事件接报数据");
+    }
+
+    /**
+     * 获取事件接报详细信息
+     */
+    //@PreAuthorize("@ss.hasPermi('system:receive:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") String id)
+    {
+        return AjaxResult.success(tEventReceiveService.selectTEventReceiveById(id));
+    }
+
+    /**
+     * 新增事件接报
+     */
+    //@PreAuthorize("@ss.hasPermi('system:receive:add')")
+    @Log(title = "事件接报", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TEventReceive tEventReceive)
+    {
+        return toAjax(tEventReceiveService.insertTEventReceive(tEventReceive));
+    }
+
+    /**
+     * 修改事件接报
+     */
+    //@PreAuthorize("@ss.hasPermi('system:receive:edit')")
+    @Log(title = "事件接报", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TEventReceive tEventReceive)
+    {
+        return toAjax(tEventReceiveService.updateTEventReceive(tEventReceive));
+    }
+
+    /**
+     * 删除事件接报
+     */
+    //@PreAuthorize("@ss.hasPermi('system:receive:remove')")
+    @Log(title = "事件接报", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids)
+    {
+        return toAjax(tEventReceiveService.deleteTEventReceiveByIds(ids));
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEmergencyDevice.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_emergency_device
+ *
+ * @author zehong
+ * @date 2022-03-21
+ */
+public class TEmergencyDevice extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private String id;
+
+    /** 1救援队伍 2救援物资 3救援车辆 4医院 */
+    @Excel(name = "1救援队伍 2救援物资 3救援车辆 4医院")
+    private Integer deviceType;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private String longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private String latitude;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String contacts;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String phone;
+
+    /** 详细地址 */
+    @Excel(name = "详细地址")
+    private String address;
+
+    /** 简介 */
+    @Excel(name = "简介")
+    private String introduce;
+
+    /** 0未删除 1已删除 */
+    @Excel(name = "0未删除 1已删除")
+    private Integer isDel;
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setDeviceType(Integer deviceType)
+    {
+        this.deviceType = deviceType;
+    }
+
+    public Integer getDeviceType()
+    {
+        return deviceType;
+    }
+    public void setDeviceName(String deviceName)
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName()
+    {
+        return deviceName;
+    }
+    public void setLongitude(String longitude)
+    {
+        this.longitude = longitude;
+    }
+
+    public String getLongitude()
+    {
+        return longitude;
+    }
+    public void setLatitude(String latitude)
+    {
+        this.latitude = latitude;
+    }
+
+    public String getLatitude()
+    {
+        return latitude;
+    }
+    public void setContacts(String contacts)
+    {
+        this.contacts = contacts;
+    }
+
+    public String getContacts()
+    {
+        return contacts;
+    }
+    public void setPhone(String phone)
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone()
+    {
+        return phone;
+    }
+    public void setAddress(String address)
+    {
+        this.address = address;
+    }
+
+    public String getAddress()
+    {
+        return address;
+    }
+    public void setIntroduce(String introduce)
+    {
+        this.introduce = introduce;
+    }
+
+    public String getIntroduce()
+    {
+        return introduce;
+    }
+    public void setIsDel(Integer isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel()
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("deviceType", getDeviceType())
+                .append("deviceName", getDeviceName())
+                .append("longitude", getLongitude())
+                .append("latitude", getLatitude())
+                .append("contacts", getContacts())
+                .append("phone", getPhone())
+                .append("address", getAddress())
+                .append("introduce", getIntroduce())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .append("isDel", getIsDel())
+                .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEventHandle.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_handle
+ * 
+ * @author zehong
+ * @date 2022-03-19
+ */
+public class TEventHandle extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long handleId;
+
+    /** 事件id */
+    @Excel(name = "事件id")
+    private Long eventId;
+
+    /** 企业id */
+    @Excel(name = "企业id")
+    private Long enterpriseId;
+
+    /** 企业名称 */
+    @Excel(name = "企业名称")
+    private String enterpriseName;
+
+    /** 处置信息 */
+    @Excel(name = "处置信息")
+    private String management;
+
+    private String managementEvent;
+
+    /** 应急预案id */
+    @Excel(name = "应急预案id")
+    private Long planId;
+
+    @Excel(name = "应急预案标题")
+    private String planTitle;
+
+    @Excel(name = "应急预案附件地址")
+    private String planUrl;
+    /** 指导意见 */
+    @Excel(name = "指导意见")
+    private String guidanceOpinion;
+
+    /** 指导时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "指导时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date guidanceTime;
+
+    /** 0未删除 1已删除 */
+    private Integer isDel;
+
+    public String getPlanTitle() {
+        return planTitle;
+    }
+
+    public void setPlanTitle(String planTitle) {
+        this.planTitle = planTitle;
+    }
+
+    public String getPlanUrl() {
+        return planUrl;
+    }
+
+    public void setPlanUrl(String planUrl) {
+        this.planUrl = planUrl;
+    }
+
+    public String getManagementEvent() {
+        return managementEvent;
+    }
+
+    public void setManagementEvent(String managementEvent) {
+        this.managementEvent = managementEvent;
+    }
+
+    public void setHandleId(Long handleId)
+    {
+        this.handleId = handleId;
+    }
+
+    public Long getHandleId() 
+    {
+        return handleId;
+    }
+    public void setEventId(Long eventId) 
+    {
+        this.eventId = eventId;
+    }
+
+    public Long getEventId() 
+    {
+        return eventId;
+    }
+    public void setEnterpriseId(Long enterpriseId) 
+    {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getEnterpriseId() 
+    {
+        return enterpriseId;
+    }
+    public void setEnterpriseName(String enterpriseName) 
+    {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getEnterpriseName() 
+    {
+        return enterpriseName;
+    }
+    public void setManagement(String management) 
+    {
+        this.management = management;
+    }
+
+    public String getManagement() 
+    {
+        return management;
+    }
+    public void setPlanId(Long planId) 
+    {
+        this.planId = planId;
+    }
+
+    public Long getPlanId() 
+    {
+        return planId;
+    }
+    public void setGuidanceOpinion(String guidanceOpinion) 
+    {
+        this.guidanceOpinion = guidanceOpinion;
+    }
+
+    public String getGuidanceOpinion() 
+    {
+        return guidanceOpinion;
+    }
+    public void setGuidanceTime(Date guidanceTime) 
+    {
+        this.guidanceTime = guidanceTime;
+    }
+
+    public Date getGuidanceTime() 
+    {
+        return guidanceTime;
+    }
+    public void setIsDel(Integer isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("handleId", getHandleId())
+            .append("eventId", getEventId())
+            .append("enterpriseId", getEnterpriseId())
+            .append("enterpriseName", getEnterpriseName())
+            .append("management", getManagement())
+            .append("planId", getPlanId())
+            .append("guidanceOpinion", getGuidanceOpinion())
+            .append("guidanceTime", getGuidanceTime())
+            .append("isDel", getIsDel())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TEventReceive.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_receive
+ * 
+ * @author zehong
+ * @date 2022-03-18
+ */
+public class TEventReceive extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Integer id;
+
+    /** 事件名称 */
+    @Excel(name = "事件名称")
+    private String eventName;
+
+    /** 事件类型 1水灾 2火灾 3突发 */
+    @Excel(name = "事件类型 1水灾 2火灾 3突发")
+    private Integer eventType;
+
+    /** 事件等级 1级 2级 3级 */
+    @Excel(name = "事件等级 1级 2级 3级")
+    private Integer eventGrade;
+
+    /** 事发地点 */
+    @Excel(name = "事发地点")
+    private String address;
+
+    /** 经度 */
+    private String longitude;
+
+    /** 纬度 */
+    private String latitude;
+
+    /** 报案人 */
+    @Excel(name = "报案人")
+    private String informant;
+
+    /** 报案时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "报案时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date inforTime;
+
+    /** 报案人电话 */
+    @Excel(name = "报案人电话")
+    private String informantPhone;
+
+    /** 事件描述 */
+    @Excel(name = "事件描述")
+    private String describe;
+
+    /** 指派公司id */
+    @Excel(name = "指派公司id")
+    private Integer enterpriseId;
+
+    /** 指派公司名称 */
+    @Excel(name = "指派公司名称")
+    private String enterpriseName;
+
+    /** 备注 */
+    private String remarks;
+
+    /** 0未删除 1已删除 */
+    private Integer isDel;
+    @Excel(name = "状态")
+    private Integer status;
+
+    public void setId(Integer id)
+    {
+        this.id = id;
+    }
+
+    public Integer getId()
+    {
+        return id;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public void setEventName(String eventName)
+    {
+        this.eventName = eventName;
+    }
+
+    public String getEventName() 
+    {
+        return eventName;
+    }
+    public void setEventType(Integer eventType) 
+    {
+        this.eventType = eventType;
+    }
+
+    public Integer getEventType() 
+    {
+        return eventType;
+    }
+    public void setEventGrade(Integer eventGrade) 
+    {
+        this.eventGrade = eventGrade;
+    }
+
+    public Integer getEventGrade() 
+    {
+        return eventGrade;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setLongitude(String longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public String getLongitude() 
+    {
+        return longitude;
+    }
+    public void setLatitude(String latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public String getLatitude() 
+    {
+        return latitude;
+    }
+    public void setInformant(String informant) 
+    {
+        this.informant = informant;
+    }
+
+    public String getInformant() 
+    {
+        return informant;
+    }
+    public void setInforTime(Date inforTime) 
+    {
+        this.inforTime = inforTime;
+    }
+
+    public Date getInforTime() 
+    {
+        return inforTime;
+    }
+    public void setInformantPhone(String informantPhone) 
+    {
+        this.informantPhone = informantPhone;
+    }
+
+    public String getInformantPhone() 
+    {
+        return informantPhone;
+    }
+    public void setDescribe(String describe) 
+    {
+        this.describe = describe;
+    }
+
+    public String getDescribe() 
+    {
+        return describe;
+    }
+    public void setEnterpriseId(Integer enterpriseId)
+    {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Integer getEnterpriseId()
+    {
+        return enterpriseId;
+    }
+    public void setEnterpriseName(String enterpriseName) 
+    {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public String getEnterpriseName() 
+    {
+        return enterpriseName;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+    public void setIsDel(Integer isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Integer getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("eventName", getEventName())
+            .append("eventType", getEventType())
+            .append("eventGrade", getEventGrade())
+            .append("address", getAddress())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("informant", getInformant())
+            .append("inforTime", getInforTime())
+            .append("informantPhone", getInformantPhone())
+            .append("describe", getDescribe())
+            .append("enterpriseId", getEnterpriseId())
+            .append("enterpriseName", getEnterpriseName())
+            .append("remarks", getRemarks())
+            .append("isDel", getIsDel())
+            .append("createTime", getCreateTime())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TVehicleInfo.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;
+
+import java.math.BigDecimal;
+
+/**
+ * 燃气车辆信息对象 t_vehicle_info
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+public class TVehicleInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 车辆id */
+    private Long vehicleId;
+
+    /** 车牌号 */
+    @Excel(name = "车牌号")
+    private String carNum;
+
+    /** 品牌型号 */
+    @Excel(name = "品牌型号")
+    private String brandModel;
+
+    /** 车辆类型: 1.罐车 2.卡车 */
+    @Excel(name = "车辆类型: 1.罐车 2.卡车")
+    private String vehicleType;
+
+    /** 车辆载重 */
+    @Excel(name = "车辆载重")
+    private String vehicleLoad;
+
+    /** 车辆大小 */
+    @Excel(name = "车辆大小")
+    private String vehicleSize;
+
+    /** 车辆限乘 */
+    @Excel(name = "车辆限乘")
+    private String vehicleLimt;
+
+    /** 车辆检测信息 */
+    @Excel(name = "车辆检测信息")
+    private String vehicleInspect;
+
+    /** 所属企业 */
+    @Excel(name = "所属企业")
+    private String beyondEnterpriseId;
+
+    /** 责任人 */
+    @Excel(name = "责任人")
+    private String personLiable;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String phone;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /**
+     * 经度
+     */
+    private BigDecimal longitude;
+
+    /**
+     * 纬度
+     */
+    private BigDecimal latitude;
+
+
+    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 setVehicleId(Long vehicleId)
+    {
+        this.vehicleId = vehicleId;
+    }
+
+    public Long getVehicleId() 
+    {
+        return vehicleId;
+    }
+    public void setCarNum(String carNum) 
+    {
+        this.carNum = carNum;
+    }
+
+    public String getCarNum() 
+    {
+        return carNum;
+    }
+    public void setBrandModel(String brandModel) 
+    {
+        this.brandModel = brandModel;
+    }
+
+    public String getBrandModel() 
+    {
+        return brandModel;
+    }
+    public void setVehicleType(String vehicleType) 
+    {
+        this.vehicleType = vehicleType;
+    }
+
+    public String getVehicleType() 
+    {
+        return vehicleType;
+    }
+    public void setVehicleLoad(String vehicleLoad) 
+    {
+        this.vehicleLoad = vehicleLoad;
+    }
+
+    public String getVehicleLoad() 
+    {
+        return vehicleLoad;
+    }
+    public void setVehicleSize(String vehicleSize) 
+    {
+        this.vehicleSize = vehicleSize;
+    }
+
+    public String getVehicleSize() 
+    {
+        return vehicleSize;
+    }
+    public void setVehicleLimt(String vehicleLimt) 
+    {
+        this.vehicleLimt = vehicleLimt;
+    }
+
+    public String getVehicleLimt() 
+    {
+        return vehicleLimt;
+    }
+    public void setVehicleInspect(String vehicleInspect) 
+    {
+        this.vehicleInspect = vehicleInspect;
+    }
+
+    public String getVehicleInspect() 
+    {
+        return vehicleInspect;
+    }
+    public void setBeyondEnterpriseId(String beyondEnterpriseId) 
+    {
+        this.beyondEnterpriseId = beyondEnterpriseId;
+    }
+
+    public String getBeyondEnterpriseId() 
+    {
+        return beyondEnterpriseId;
+    }
+    public void setPersonLiable(String personLiable) 
+    {
+        this.personLiable = personLiable;
+    }
+
+    public String getPersonLiable() 
+    {
+        return personLiable;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    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("vehicleId", getVehicleId())
+            .append("carNum", getCarNum())
+            .append("brandModel", getBrandModel())
+            .append("vehicleType", getVehicleType())
+            .append("vehicleLoad", getVehicleLoad())
+            .append("vehicleSize", getVehicleSize())
+            .append("vehicleLimt", getVehicleLimt())
+            .append("vehicleInspect", getVehicleInspect())
+            .append("beyondEnterpriseId", getBeyondEnterpriseId())
+            .append("personLiable", getPersonLiable())
+            .append("phone", getPhone())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TVehicleLocationInfo.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_vehicle_location_info
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+public class TVehicleLocationInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 车辆id */
+    private Long vehicleLocationId;
+
+    /** 车牌号 */
+    @Excel(name = "车牌号")
+    private String carNum;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reportTime;
+
+    /** 是否删除(0正常，1删除) */
+    @Excel(name = "是否删除(0正常，1删除)")
+    private String isDel;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /**是否获取最后一次位置*/
+    private boolean isLast;
+
+    /**位置查询开始时间*/
+    private Date beginTime;
+
+    /**位置查询结束时间*/
+    private Date endTime;
+
+    public Date getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(Date beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public boolean isLast() {
+        return isLast;
+    }
+
+    public void setLast(boolean last) {
+        isLast = last;
+    }
+
+    public void setVehicleLocationId(Long vehicleLocationId)
+    {
+        this.vehicleLocationId = vehicleLocationId;
+    }
+
+    public Long getVehicleLocationId() 
+    {
+        return vehicleLocationId;
+    }
+    public void setCarNum(String carNum) 
+    {
+        this.carNum = carNum;
+    }
+
+    public String getCarNum() 
+    {
+        return carNum;
+    }
+    public void setLongitude(BigDecimal longitude) 
+    {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLongitude() 
+    {
+        return longitude;
+    }
+    public void setLatitude(BigDecimal latitude) 
+    {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getLatitude() 
+    {
+        return latitude;
+    }
+    public void setReportTime(Date reportTime) 
+    {
+        this.reportTime = reportTime;
+    }
+
+    public Date getReportTime() 
+    {
+        return reportTime;
+    }
+    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("vehicleLocationId", getVehicleLocationId())
+            .append("carNum", getCarNum())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("reportTime", getReportTime())
+            .append("isDel", getIsDel())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TEmergencyDevice;
+
+/**
+ * 应急设备Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+public interface TEmergencyDeviceMapper 
+{
+    /**
+     * 查询应急设备
+     * 
+     * @param id 应急设备ID
+     * @return 应急设备
+     */
+    public TEmergencyDevice selectTEmergencyDeviceById(String id);
+
+    /**
+     * 查询应急设备列表
+     * 
+     * @param tEmergencyDevice 应急设备
+     * @return 应急设备集合
+     */
+    public List<TEmergencyDevice> selectTEmergencyDeviceList(TEmergencyDevice tEmergencyDevice);
+
+    /**
+     * 新增应急设备
+     * 
+     * @param tEmergencyDevice 应急设备
+     * @return 结果
+     */
+    public int insertTEmergencyDevice(TEmergencyDevice tEmergencyDevice);
+
+    /**
+     * 修改应急设备
+     * 
+     * @param tEmergencyDevice 应急设备
+     * @return 结果
+     */
+    public int updateTEmergencyDevice(TEmergencyDevice tEmergencyDevice);
+
+    /**
+     * 删除应急设备
+     * 
+     * @param id 应急设备ID
+     * @return 结果
+     */
+    public int deleteTEmergencyDeviceById(String id);
+
+    /**
+     * 批量删除应急设备
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTEmergencyDeviceByIds(String[] ids);
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TEventHandle;
+
+/**
+ * 事件处置Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-03-19
+ */
+public interface TEventHandleMapper 
+{
+    /**
+     * 查询事件处置
+     * 
+     * @param handleId 事件处置ID
+     * @return 事件处置
+     */
+    public TEventHandle selectTEventHandleById(Long handleId);
+
+    /**
+     * 查询事件处置列表
+     * 
+     * @param tEventHandle 事件处置
+     * @return 事件处置集合
+     */
+    public List<TEventHandle> selectTEventHandleList(TEventHandle tEventHandle);
+
+    /**
+     * 新增事件处置
+     * 
+     * @param tEventHandle 事件处置
+     * @return 结果
+     */
+    public int insertTEventHandle(TEventHandle tEventHandle);
+
+    /**
+     * 修改事件处置
+     * 
+     * @param tEventHandle 事件处置
+     * @return 结果
+     */
+    public int updateTEventHandle(TEventHandle tEventHandle);
+
+    /**
+     * 删除事件处置
+     * 
+     * @param handleId 事件处置ID
+     * @return 结果
+     */
+    public int deleteTEventHandleById(Long handleId);
+
+    /**
+     * 批量删除事件处置
+     * 
+     * @param handleIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTEventHandleByIds(Long[] handleIds);
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TEventReceive;
+
+/**
+ * 事件接报Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-03-18
+ */
+public interface TEventReceiveMapper 
+{
+    /**
+     * 查询事件接报
+     * 
+     * @param id 事件接报ID
+     * @return 事件接报
+     */
+    public TEventReceive selectTEventReceiveById(String id);
+
+    /**
+     * 查询事件接报列表
+     * 
+     * @param tEventReceive 事件接报
+     * @return 事件接报集合
+     */
+    public List<TEventReceive> selectTEventReceiveList(TEventReceive tEventReceive);
+
+    /**
+     * 新增事件接报
+     * 
+     * @param tEventReceive 事件接报
+     * @return 结果
+     */
+    public int insertTEventReceive(TEventReceive tEventReceive);
+
+    /**
+     * 修改事件接报
+     * 
+     * @param tEventReceive 事件接报
+     * @return 结果
+     */
+    public int updateTEventReceive(TEventReceive tEventReceive);
+
+    /**
+     * 删除事件接报
+     * 
+     * @param id 事件接报ID
+     * @return 结果
+     */
+    public int deleteTEventReceiveById(String id);
+
+    /**
+     * 批量删除事件接报
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTEventReceiveByIds(String[] ids);
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TVehicleInfo;
+
+/**
+ * 燃气车辆信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+public interface TVehicleInfoMapper 
+{
+    /**
+     * 查询燃气车辆信息
+     * 
+     * @param vehicleId 燃气车辆信息ID
+     * @return 燃气车辆信息
+     */
+    public TVehicleInfo selectTVehicleInfoById(Long vehicleId);
+
+    /**
+     * 查询燃气车辆信息列表
+     * 
+     * @param tVehicleInfo 燃气车辆信息
+     * @return 燃气车辆信息集合
+     */
+    public List<TVehicleInfo> selectTVehicleInfoList(TVehicleInfo tVehicleInfo);
+
+    /**
+     * 新增燃气车辆信息
+     * 
+     * @param tVehicleInfo 燃气车辆信息
+     * @return 结果
+     */
+    public int insertTVehicleInfo(TVehicleInfo tVehicleInfo);
+
+    /**
+     * 修改燃气车辆信息
+     * 
+     * @param tVehicleInfo 燃气车辆信息
+     * @return 结果
+     */
+    public int updateTVehicleInfo(TVehicleInfo tVehicleInfo);
+
+    /**
+     * 删除燃气车辆信息
+     * 
+     * @param vehicleId 燃气车辆信息ID
+     * @return 结果
+     */
+    public int deleteTVehicleInfoById(Long vehicleId);
+
+    /**
+     * 批量删除燃气车辆信息
+     * 
+     * @param vehicleIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTVehicleInfoByIds(Long[] vehicleIds);
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TVehicleLocationInfo;
+
+/**
+ * 燃气车辆位置信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+public interface TVehicleLocationInfoMapper 
+{
+    /**
+     * 查询燃气车辆位置信息
+     * 
+     * @param vehicleLocationId 燃气车辆位置信息ID
+     * @return 燃气车辆位置信息
+     */
+    public TVehicleLocationInfo selectTVehicleLocationInfoById(Long vehicleLocationId);
+
+    /**
+     * 查询燃气车辆位置信息列表
+     * 
+     * @param tVehicleLocationInfo 燃气车辆位置信息
+     * @return 燃气车辆位置信息集合
+     */
+    public List<TVehicleLocationInfo> selectTVehicleLocationInfoList(TVehicleLocationInfo tVehicleLocationInfo);
+
+    /**
+     * 新增燃气车辆位置信息
+     * 
+     * @param tVehicleLocationInfo 燃气车辆位置信息
+     * @return 结果
+     */
+    public int insertTVehicleLocationInfo(TVehicleLocationInfo tVehicleLocationInfo);
+
+    /**
+     * 修改燃气车辆位置信息
+     * 
+     * @param tVehicleLocationInfo 燃气车辆位置信息
+     * @return 结果
+     */
+    public int updateTVehicleLocationInfo(TVehicleLocationInfo tVehicleLocationInfo);
+
+    /**
+     * 删除燃气车辆位置信息
+     * 
+     * @param vehicleLocationId 燃气车辆位置信息ID
+     * @return 结果
+     */
+    public int deleteTVehicleLocationInfoById(Long vehicleLocationId);
+
+    /**
+     * 批量删除燃气车辆位置信息
+     * 
+     * @param vehicleLocationIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTVehicleLocationInfoByIds(Long[] vehicleLocationIds);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TEmergencyDevice;
+
+/**
+ * 应急设备Service接口
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+public interface ITEmergencyDeviceService 
+{
+    /**
+     * 查询应急设备
+     * 
+     * @param id 应急设备ID
+     * @return 应急设备
+     */
+    public TEmergencyDevice selectTEmergencyDeviceById(String id);
+
+    /**
+     * 查询应急设备列表
+     * 
+     * @param tEmergencyDevice 应急设备
+     * @return 应急设备集合
+     */
+    public List<TEmergencyDevice> selectTEmergencyDeviceList(TEmergencyDevice tEmergencyDevice);
+
+    /**
+     * 新增应急设备
+     * 
+     * @param tEmergencyDevice 应急设备
+     * @return 结果
+     */
+    public int insertTEmergencyDevice(TEmergencyDevice tEmergencyDevice);
+
+    /**
+     * 修改应急设备
+     * 
+     * @param tEmergencyDevice 应急设备
+     * @return 结果
+     */
+    public int updateTEmergencyDevice(TEmergencyDevice tEmergencyDevice);
+
+    /**
+     * 批量删除应急设备
+     * 
+     * @param ids 需要删除的应急设备ID
+     * @return 结果
+     */
+    public int deleteTEmergencyDeviceByIds(String[] ids);
+
+    /**
+     * 删除应急设备信息
+     * 
+     * @param id 应急设备ID
+     * @return 结果
+     */
+    public int deleteTEmergencyDeviceById(String id);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TEventHandle;
+
+/**
+ * 事件处置Service接口
+ * 
+ * @author zehong
+ * @date 2022-03-19
+ */
+public interface ITEventHandleService 
+{
+    /**
+     * 查询事件处置
+     * 
+     * @param handleId 事件处置ID
+     * @return 事件处置
+     */
+    public TEventHandle selectTEventHandleById(Long handleId);
+
+    /**
+     * 查询事件处置列表
+     * 
+     * @param tEventHandle 事件处置
+     * @return 事件处置集合
+     */
+    public List<TEventHandle> selectTEventHandleList(TEventHandle tEventHandle);
+
+    /**
+     * 新增事件处置
+     * 
+     * @param tEventHandle 事件处置
+     * @return 结果
+     */
+    public int insertTEventHandle(TEventHandle tEventHandle);
+
+    /**
+     * 修改事件处置
+     * 
+     * @param tEventHandle 事件处置
+     * @return 结果
+     */
+    public int updateTEventHandle(TEventHandle tEventHandle);
+
+    /**
+     * 批量删除事件处置
+     * 
+     * @param handleIds 需要删除的事件处置ID
+     * @return 结果
+     */
+    public int deleteTEventHandleByIds(Long[] handleIds);
+
+    /**
+     * 删除事件处置信息
+     * 
+     * @param handleId 事件处置ID
+     * @return 结果
+     */
+    public int deleteTEventHandleById(Long handleId);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TEventReceive;
+
+/**
+ * 事件接报Service接口
+ * 
+ * @author zehong
+ * @date 2022-03-18
+ */
+public interface ITEventReceiveService 
+{
+    /**
+     * 查询事件接报
+     * 
+     * @param id 事件接报ID
+     * @return 事件接报
+     */
+    public TEventReceive selectTEventReceiveById(String id);
+
+    /**
+     * 查询事件接报列表
+     * 
+     * @param tEventReceive 事件接报
+     * @return 事件接报集合
+     */
+    public List<TEventReceive> selectTEventReceiveList(TEventReceive tEventReceive);
+
+    /**
+     * 新增事件接报
+     * 
+     * @param tEventReceive 事件接报
+     * @return 结果
+     */
+    public int insertTEventReceive(TEventReceive tEventReceive);
+
+    /**
+     * 修改事件接报
+     * 
+     * @param tEventReceive 事件接报
+     * @return 结果
+     */
+    public int updateTEventReceive(TEventReceive tEventReceive);
+
+    /**
+     * 批量删除事件接报
+     * 
+     * @param ids 需要删除的事件接报ID
+     * @return 结果
+     */
+    public int deleteTEventReceiveByIds(String[] ids);
+
+    /**
+     * 删除事件接报信息
+     * 
+     * @param id 事件接报ID
+     * @return 结果
+     */
+    public int deleteTEventReceiveById(String id);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TVehicleInfo;
+
+/**
+ * 燃气车辆信息Service接口
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+public interface ITVehicleInfoService 
+{
+    /**
+     * 查询燃气车辆信息
+     * 
+     * @param vehicleId 燃气车辆信息ID
+     * @return 燃气车辆信息
+     */
+    public TVehicleInfo selectTVehicleInfoById(Long vehicleId);
+
+    /**
+     * 查询燃气车辆信息列表
+     * 
+     * @param tVehicleInfo 燃气车辆信息
+     * @return 燃气车辆信息集合
+     */
+    public List<TVehicleInfo> selectTVehicleInfoList(TVehicleInfo tVehicleInfo);
+
+    /**
+     * 新增燃气车辆信息
+     * 
+     * @param tVehicleInfo 燃气车辆信息
+     * @return 结果
+     */
+    public int insertTVehicleInfo(TVehicleInfo tVehicleInfo);
+
+    /**
+     * 修改燃气车辆信息
+     * 
+     * @param tVehicleInfo 燃气车辆信息
+     * @return 结果
+     */
+    public int updateTVehicleInfo(TVehicleInfo tVehicleInfo);
+
+    /**
+     * 批量删除燃气车辆信息
+     * 
+     * @param vehicleIds 需要删除的燃气车辆信息ID
+     * @return 结果
+     */
+    public int deleteTVehicleInfoByIds(Long[] vehicleIds);
+
+    /**
+     * 删除燃气车辆信息信息
+     * 
+     * @param vehicleId 燃气车辆信息ID
+     * @return 结果
+     */
+    public int deleteTVehicleInfoById(Long vehicleId);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TVehicleLocationInfo;
+
+/**
+ * 燃气车辆位置信息Service接口
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+public interface ITVehicleLocationInfoService 
+{
+    /**
+     * 查询燃气车辆位置信息
+     * 
+     * @param vehicleLocationId 燃气车辆位置信息ID
+     * @return 燃气车辆位置信息
+     */
+    public TVehicleLocationInfo selectTVehicleLocationInfoById(Long vehicleLocationId);
+
+    /**
+     * 查询燃气车辆位置信息列表
+     * 
+     * @param tVehicleLocationInfo 燃气车辆位置信息
+     * @return 燃气车辆位置信息集合
+     */
+    public List<TVehicleLocationInfo> selectTVehicleLocationInfoList(TVehicleLocationInfo tVehicleLocationInfo);
+
+    /**
+     * 新增燃气车辆位置信息
+     * 
+     * @param tVehicleLocationInfo 燃气车辆位置信息
+     * @return 结果
+     */
+    public int insertTVehicleLocationInfo(TVehicleLocationInfo tVehicleLocationInfo);
+
+    /**
+     * 修改燃气车辆位置信息
+     * 
+     * @param tVehicleLocationInfo 燃气车辆位置信息
+     * @return 结果
+     */
+    public int updateTVehicleLocationInfo(TVehicleLocationInfo tVehicleLocationInfo);
+
+    /**
+     * 批量删除燃气车辆位置信息
+     * 
+     * @param vehicleLocationIds 需要删除的燃气车辆位置信息ID
+     * @return 结果
+     */
+    public int deleteTVehicleLocationInfoByIds(Long[] vehicleLocationIds);
+
+    /**
+     * 删除燃气车辆位置信息信息
+     * 
+     * @param vehicleLocationId 燃气车辆位置信息ID
+     * @return 结果
+     */
+    public int deleteTVehicleLocationInfoById(Long vehicleLocationId);
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TEmergencyDeviceServiceImpl.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.TEmergencyDeviceMapper;
+import com.zehong.system.domain.TEmergencyDevice;
+import com.zehong.system.service.ITEmergencyDeviceService;
+
+/**
+ * 应急设备Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+@Service
+public class TEmergencyDeviceServiceImpl implements ITEmergencyDeviceService 
+{
+    @Autowired
+    private TEmergencyDeviceMapper tEmergencyDeviceMapper;
+
+    /**
+     * 查询应急设备
+     * 
+     * @param id 应急设备ID
+     * @return 应急设备
+     */
+    @Override
+    public TEmergencyDevice selectTEmergencyDeviceById(String id)
+    {
+        return tEmergencyDeviceMapper.selectTEmergencyDeviceById(id);
+    }
+
+    /**
+     * 查询应急设备列表
+     * 
+     * @param tEmergencyDevice 应急设备
+     * @return 应急设备
+     */
+    @Override
+    public List<TEmergencyDevice> selectTEmergencyDeviceList(TEmergencyDevice tEmergencyDevice)
+    {
+        return tEmergencyDeviceMapper.selectTEmergencyDeviceList(tEmergencyDevice);
+    }
+
+    /**
+     * 新增应急设备
+     * 
+     * @param tEmergencyDevice 应急设备
+     * @return 结果
+     */
+    @Override
+    public int insertTEmergencyDevice(TEmergencyDevice tEmergencyDevice)
+    {
+        tEmergencyDevice.setCreateTime(DateUtils.getNowDate());
+        return tEmergencyDeviceMapper.insertTEmergencyDevice(tEmergencyDevice);
+    }
+
+    /**
+     * 修改应急设备
+     * 
+     * @param tEmergencyDevice 应急设备
+     * @return 结果
+     */
+    @Override
+    public int updateTEmergencyDevice(TEmergencyDevice tEmergencyDevice)
+    {
+        tEmergencyDevice.setUpdateTime(DateUtils.getNowDate());
+        return tEmergencyDeviceMapper.updateTEmergencyDevice(tEmergencyDevice);
+    }
+
+    /**
+     * 批量删除应急设备
+     * 
+     * @param ids 需要删除的应急设备ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEmergencyDeviceByIds(String[] ids)
+    {
+        return tEmergencyDeviceMapper.deleteTEmergencyDeviceByIds(ids);
+    }
+
+    /**
+     * 删除应急设备信息
+     * 
+     * @param id 应急设备ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEmergencyDeviceById(String id)
+    {
+        return tEmergencyDeviceMapper.deleteTEmergencyDeviceById(id);
+    }
+}

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

+package com.zehong.system.service.impl;
+
+import java.util.Date;
+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.TEventHandleMapper;
+import com.zehong.system.domain.TEventHandle;
+import com.zehong.system.service.ITEventHandleService;
+
+/**
+ * 事件处置Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-03-19
+ */
+@Service
+public class TEventHandleServiceImpl implements ITEventHandleService 
+{
+    @Autowired
+    private TEventHandleMapper tEventHandleMapper;
+
+    /**
+     * 查询事件处置
+     * 
+     * @param handleId 事件处置ID
+     * @return 事件处置
+     */
+    @Override
+    public TEventHandle selectTEventHandleById(Long handleId)
+    {
+        return tEventHandleMapper.selectTEventHandleById(handleId);
+    }
+
+    /**
+     * 查询事件处置列表
+     * 
+     * @param tEventHandle 事件处置
+     * @return 事件处置
+     */
+    @Override
+    public List<TEventHandle> selectTEventHandleList(TEventHandle tEventHandle)
+    {
+        return tEventHandleMapper.selectTEventHandleList(tEventHandle);
+    }
+
+    /**
+     * 新增事件处置
+     * 
+     * @param tEventHandle 事件处置
+     * @return 结果
+     */
+    @Override
+    public int insertTEventHandle(TEventHandle tEventHandle)
+    {
+        tEventHandle.setCreateTime(DateUtils.getNowDate());
+        return tEventHandleMapper.insertTEventHandle(tEventHandle);
+    }
+
+    /**
+     * 修改事件处置
+     * 
+     * @param tEventHandle 事件处置
+     * @return 结果
+     */
+    @Override
+    public int updateTEventHandle(TEventHandle tEventHandle)
+    {
+        tEventHandle.setGuidanceTime(new Date());
+        return tEventHandleMapper.updateTEventHandle(tEventHandle);
+    }
+
+    /**
+     * 批量删除事件处置
+     * 
+     * @param handleIds 需要删除的事件处置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEventHandleByIds(Long[] handleIds)
+    {
+        return tEventHandleMapper.deleteTEventHandleByIds(handleIds);
+    }
+
+    /**
+     * 删除事件处置信息
+     * 
+     * @param handleId 事件处置ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEventHandleById(Long handleId)
+    {
+        return tEventHandleMapper.deleteTEventHandleById(handleId);
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TEventReceiveServiceImpl.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.TEventReceiveMapper;
+import com.zehong.system.domain.TEventReceive;
+import com.zehong.system.service.ITEventReceiveService;
+
+/**
+ * 事件接报Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-03-18
+ */
+@Service
+public class TEventReceiveServiceImpl implements ITEventReceiveService 
+{
+    @Autowired
+    private TEventReceiveMapper tEventReceiveMapper;
+
+    /**
+     * 查询事件接报
+     * 
+     * @param id 事件接报ID
+     * @return 事件接报
+     */
+    @Override
+    public TEventReceive selectTEventReceiveById(String id)
+    {
+        return tEventReceiveMapper.selectTEventReceiveById(id);
+    }
+
+    /**
+     * 查询事件接报列表
+     * 
+     * @param tEventReceive 事件接报
+     * @return 事件接报
+     */
+    @Override
+    public List<TEventReceive> selectTEventReceiveList(TEventReceive tEventReceive)
+    {
+        return tEventReceiveMapper.selectTEventReceiveList(tEventReceive);
+    }
+
+    /**
+     * 新增事件接报
+     * 
+     * @param tEventReceive 事件接报
+     * @return 结果
+     */
+    @Override
+    public int insertTEventReceive(TEventReceive tEventReceive)
+    {
+        if(tEventReceive.getEnterpriseId()!=null){
+            tEventReceive.setStatus(2);
+        }
+        tEventReceive.setCreateTime(DateUtils.getNowDate());
+        return tEventReceiveMapper.insertTEventReceive(tEventReceive);
+    }
+
+    /**
+     * 修改事件接报
+     * 
+     * @param tEventReceive 事件接报
+     * @return 结果
+     */
+    @Override
+    public int updateTEventReceive(TEventReceive tEventReceive)
+    {
+        return tEventReceiveMapper.updateTEventReceive(tEventReceive);
+    }
+
+    /**
+     * 批量删除事件接报
+     * 
+     * @param ids 需要删除的事件接报ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEventReceiveByIds(String[] ids)
+    {
+        return tEventReceiveMapper.deleteTEventReceiveByIds(ids);
+    }
+
+    /**
+     * 删除事件接报信息
+     * 
+     * @param id 事件接报ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTEventReceiveById(String id)
+    {
+        return tEventReceiveMapper.deleteTEventReceiveById(id);
+    }
+}

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

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TVehicleInfoMapper;
+import com.zehong.system.domain.TVehicleInfo;
+import com.zehong.system.service.ITVehicleInfoService;
+
+/**
+ * 燃气车辆信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+@Service
+public class TVehicleInfoServiceImpl implements ITVehicleInfoService 
+{
+    @Autowired
+    private TVehicleInfoMapper tVehicleInfoMapper;
+
+    /**
+     * 查询燃气车辆信息
+     * 
+     * @param vehicleId 燃气车辆信息ID
+     * @return 燃气车辆信息
+     */
+    @Override
+    public TVehicleInfo selectTVehicleInfoById(Long vehicleId)
+    {
+        return tVehicleInfoMapper.selectTVehicleInfoById(vehicleId);
+    }
+
+    /**
+     * 查询燃气车辆信息列表
+     * 
+     * @param tVehicleInfo 燃气车辆信息
+     * @return 燃气车辆信息
+     */
+    @Override
+    public List<TVehicleInfo> selectTVehicleInfoList(TVehicleInfo tVehicleInfo)
+    {
+        return tVehicleInfoMapper.selectTVehicleInfoList(tVehicleInfo);
+    }
+
+    /**
+     * 新增燃气车辆信息
+     * 
+     * @param tVehicleInfo 燃气车辆信息
+     * @return 结果
+     */
+    @Override
+    public int insertTVehicleInfo(TVehicleInfo tVehicleInfo)
+    {
+        return tVehicleInfoMapper.insertTVehicleInfo(tVehicleInfo);
+    }
+
+    /**
+     * 修改燃气车辆信息
+     * 
+     * @param tVehicleInfo 燃气车辆信息
+     * @return 结果
+     */
+    @Override
+    public int updateTVehicleInfo(TVehicleInfo tVehicleInfo)
+    {
+        return tVehicleInfoMapper.updateTVehicleInfo(tVehicleInfo);
+    }
+
+    /**
+     * 批量删除燃气车辆信息
+     * 
+     * @param vehicleIds 需要删除的燃气车辆信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTVehicleInfoByIds(Long[] vehicleIds)
+    {
+        return tVehicleInfoMapper.deleteTVehicleInfoByIds(vehicleIds);
+    }
+
+    /**
+     * 删除燃气车辆信息信息
+     * 
+     * @param vehicleId 燃气车辆信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTVehicleInfoById(Long vehicleId)
+    {
+        return tVehicleInfoMapper.deleteTVehicleInfoById(vehicleId);
+    }
+}

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

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TVehicleLocationInfoMapper;
+import com.zehong.system.domain.TVehicleLocationInfo;
+import com.zehong.system.service.ITVehicleLocationInfoService;
+
+/**
+ * 燃气车辆位置信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2022-03-17
+ */
+@Service
+public class TVehicleLocationInfoServiceImpl implements ITVehicleLocationInfoService 
+{
+    @Autowired
+    private TVehicleLocationInfoMapper tVehicleLocationInfoMapper;
+
+    /**
+     * 查询燃气车辆位置信息
+     * 
+     * @param vehicleLocationId 燃气车辆位置信息ID
+     * @return 燃气车辆位置信息
+     */
+    @Override
+    public TVehicleLocationInfo selectTVehicleLocationInfoById(Long vehicleLocationId)
+    {
+        return tVehicleLocationInfoMapper.selectTVehicleLocationInfoById(vehicleLocationId);
+    }
+
+    /**
+     * 查询燃气车辆位置信息列表
+     * 
+     * @param tVehicleLocationInfo 燃气车辆位置信息
+     * @return 燃气车辆位置信息
+     */
+    @Override
+    public List<TVehicleLocationInfo> selectTVehicleLocationInfoList(TVehicleLocationInfo tVehicleLocationInfo)
+    {
+        return tVehicleLocationInfoMapper.selectTVehicleLocationInfoList(tVehicleLocationInfo);
+    }
+
+    /**
+     * 新增燃气车辆位置信息
+     * 
+     * @param tVehicleLocationInfo 燃气车辆位置信息
+     * @return 结果
+     */
+    @Override
+    public int insertTVehicleLocationInfo(TVehicleLocationInfo tVehicleLocationInfo)
+    {
+        return tVehicleLocationInfoMapper.insertTVehicleLocationInfo(tVehicleLocationInfo);
+    }
+
+    /**
+     * 修改燃气车辆位置信息
+     * 
+     * @param tVehicleLocationInfo 燃气车辆位置信息
+     * @return 结果
+     */
+    @Override
+    public int updateTVehicleLocationInfo(TVehicleLocationInfo tVehicleLocationInfo)
+    {
+        return tVehicleLocationInfoMapper.updateTVehicleLocationInfo(tVehicleLocationInfo);
+    }
+
+    /**
+     * 批量删除燃气车辆位置信息
+     * 
+     * @param vehicleLocationIds 需要删除的燃气车辆位置信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTVehicleLocationInfoByIds(Long[] vehicleLocationIds)
+    {
+        return tVehicleLocationInfoMapper.deleteTVehicleLocationInfoByIds(vehicleLocationIds);
+    }
+
+    /**
+     * 删除燃气车辆位置信息信息
+     * 
+     * @param vehicleLocationId 燃气车辆位置信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTVehicleLocationInfoById(Long vehicleLocationId)
+    {
+        return tVehicleLocationInfoMapper.deleteTVehicleLocationInfoById(vehicleLocationId);
+    }
+}

gassafetyprogress-system/src/main/resources/mapper/system/TEmergencyDeviceMapper.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.TEmergencyDeviceMapper">
+    
+    <resultMap type="TEmergencyDevice" id="TEmergencyDeviceResult">
+        <result property="id"    column="id"    />
+        <result property="deviceType"    column="device_type"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="contacts"    column="contacts"    />
+        <result property="phone"    column="phone"    />
+        <result property="address"    column="address"    />
+        <result property="introduce"    column="introduce"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+    </resultMap>
+
+    <sql id="selectTEmergencyDeviceVo">
+        select id, device_type, device_name, longitude, latitude, contacts, phone, address, introduce, create_time, update_time, is_del from t_emergency_device
+    </sql>
+
+    <select id="selectTEmergencyDeviceList" parameterType="TEmergencyDevice" resultMap="TEmergencyDeviceResult">
+        <include refid="selectTEmergencyDeviceVo"/>
+        <where>  
+            <if test="deviceType != null "> and device_type = #{deviceType}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="longitude != null  and longitude != ''"> and longitude = #{longitude}</if>
+            <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+        </where>
+    </select>
+    
+    <select id="selectTEmergencyDeviceById" parameterType="String" resultMap="TEmergencyDeviceResult">
+        <include refid="selectTEmergencyDeviceVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTEmergencyDevice" parameterType="TEmergencyDevice">
+        insert into t_emergency_device
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="deviceType != null">device_type,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="contacts != null">contacts,</if>
+            <if test="phone != null">phone,</if>
+            <if test="address != null">address,</if>
+            <if test="introduce != null">introduce,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="deviceType != null">#{deviceType},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="contacts != null">#{contacts},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="address != null">#{address},</if>
+            <if test="introduce != null">#{introduce},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+        </trim>
+    </insert>
+
+    <update id="updateTEmergencyDevice" parameterType="TEmergencyDevice">
+        update t_emergency_device
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceType != null">device_type = #{deviceType},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="contacts != null">contacts = #{contacts},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="introduce != null">introduce = #{introduce},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTEmergencyDeviceById" parameterType="String">
+        delete from t_emergency_device where id = #{id}
+    </delete>
+
+    <delete id="deleteTEmergencyDeviceByIds" parameterType="String">
+        delete from t_emergency_device where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TEventHandleMapper.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.TEventHandleMapper">
+    
+    <resultMap type="TEventHandle" id="TEventHandleResult">
+        <result property="handleId"    column="handle_id"    />
+        <result property="eventId"    column="event_id"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="enterpriseName"    column="enterprise_name"    />
+        <result property="management"    column="management"    />
+        <result property="managementEvent"    column="management_event"    />
+        <result property="planId"    column="plan_id"    />
+        <result property="planTitle"    column="plan_title"    />
+        <result property="planUrl"    column="plan_url"    />
+        <result property="guidanceOpinion"    column="guidance_opinion"    />
+        <result property="guidanceTime"    column="guidance_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectTEventHandleVo">
+        select handle_id, event_id, enterprise_id, enterprise_name, management,management_event, plan_id,plan_title,plan_url, guidance_opinion, guidance_time, is_del, create_time from t_event_handle
+    </sql>
+
+    <select id="selectTEventHandleList" parameterType="TEventHandle" resultMap="TEventHandleResult">
+        <include refid="selectTEventHandleVo"/>
+        <where>  
+            <if test="eventId != null "> and event_id = #{eventId}</if>
+        </where>
+    </select>
+    
+    <select id="selectTEventHandleById" parameterType="Long" resultMap="TEventHandleResult">
+        <include refid="selectTEventHandleVo"/>
+        where handle_id = #{handleId}
+    </select>
+        
+    <insert id="insertTEventHandle" parameterType="TEventHandle" useGeneratedKeys="true" keyProperty="handleId">
+        insert into t_event_handle
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="eventId != null">event_id,</if>
+            <if test="enterpriseId != null">enterprise_id,</if>
+            <if test="enterpriseName != null">enterprise_name,</if>
+            <if test="management != null">management,</if>
+            <if test="managementEvent != null">management_event,</if>
+            <if test="planId != null">plan_id,</if>
+            <if test="planTitle != null">plan_title,</if>
+            <if test="planUrl != null">plan_url,</if>
+            <if test="guidanceOpinion != null">guidance_opinion,</if>
+            <if test="guidanceTime != null">guidance_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="eventId != null">#{eventId},</if>
+            <if test="enterpriseId != null">#{enterpriseId},</if>
+            <if test="enterpriseName != null">#{enterpriseName},</if>
+            <if test="management != null">#{management},</if>
+            <if test="managementEvent != null">#{managementEvent},</if>
+            <if test="planId != null">#{planId},</if>
+            <if test="planTitle != null">#{planTitle},</if>
+            <if test="planUrl != null">#{planUrl},</if>
+            <if test="guidanceOpinion != null">#{guidanceOpinion},</if>
+            <if test="guidanceTime != null">#{guidanceTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTEventHandle" parameterType="TEventHandle">
+        update t_event_handle
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="eventId != null">event_id = #{eventId},</if>
+            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
+            <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
+            <if test="management != null">management = #{management},</if>
+            <if test="managementEvent != null">management_event = #{managementEvent},</if>
+            <if test="planId != null">plan_id = #{planId},</if>
+            <if test="planTitle != null">plan_title = #{planTitle},</if>
+            <if test="planUrl != null">plan_url = #{planUrl},</if>
+            <if test="guidanceOpinion != null">guidance_opinion = #{guidanceOpinion},</if>
+            <if test="guidanceTime != null">guidance_time = #{guidanceTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where handle_id = #{handleId}
+    </update>
+
+    <delete id="deleteTEventHandleById" parameterType="Long">
+        delete from t_event_handle where handle_id = #{handleId}
+    </delete>
+
+    <delete id="deleteTEventHandleByIds" parameterType="String">
+        delete from t_event_handle where handle_id in 
+        <foreach item="handleId" collection="array" open="(" separator="," close=")">
+            #{handleId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TEventReceiveMapper.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.TEventReceiveMapper">
+    
+    <resultMap type="TEventReceive" id="TEventReceiveResult">
+        <result property="id"    column="id"    />
+        <result property="eventName"    column="event_name"    />
+        <result property="eventType"    column="event_type"    />
+        <result property="eventGrade"    column="event_grade"    />
+        <result property="address"    column="address"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="informant"    column="informant"    />
+        <result property="inforTime"    column="infor_time"    />
+        <result property="informantPhone"    column="informant_phone"    />
+        <result property="describe"    column="describe"    />
+        <result property="status"    column="status"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="enterpriseName"    column="enterprise_name"    />
+        <result property="remarks"    column="remarks"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createTime"    column="create_time"    />
+    </resultMap>
+
+    <sql id="selectTEventReceiveVo">
+        select id, event_name, event_type, event_grade, address, longitude, latitude, informant, infor_time, informant_phone, `describe`, `status`,enterprise_id, enterprise_name, remarks, is_del, create_time from t_event_receive
+    </sql>
+
+    <select id="selectTEventReceiveList" parameterType="TEventReceive" resultMap="TEventReceiveResult">
+        <include refid="selectTEventReceiveVo"/>
+        <where>  
+            <if test="eventName != null  and eventName != ''"> and event_name like concat('%', #{eventName}, '%')</if>
+            <if test="eventType != null "> and event_type = #{eventType}</if>
+            <if test="eventGrade != null "> and event_grade = #{eventGrade}</if>
+            <if test="enterpriseId != null and enterpriseId != ''"> and enterprise_id = #{enterpriseId}</if>
+            <if test="status != null and status!=5"> and status = #{status}</if>
+            <if test="status ==5"> and status !=4 </if>
+            and is_del = 0
+        </where>
+        order by infor_time
+    </select>
+    
+    <select id="selectTEventReceiveById" parameterType="String" resultMap="TEventReceiveResult">
+        <include refid="selectTEventReceiveVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTEventReceive" parameterType="TEventReceive">
+        insert into t_event_receive
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="eventName != null">event_name,</if>
+            <if test="eventType != null">event_type,</if>
+            <if test="eventGrade != null">event_grade,</if>
+            <if test="address != null">address,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="informant != null">informant,</if>
+            <if test="inforTime != null">infor_time,</if>
+            <if test="informantPhone != null">informant_phone,</if>
+            <if test="describe != null">`describe`,</if>
+            <if test="status != null">`status`,</if>
+            <if test="enterpriseId != null">enterprise_id,</if>
+            <if test="enterpriseName != null">enterprise_name,</if>
+            <if test="remarks != null">remarks,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createTime != null">create_time,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="eventName != null">#{eventName},</if>
+            <if test="eventType != null">#{eventType},</if>
+            <if test="eventGrade != null">#{eventGrade},</if>
+            <if test="address != null">#{address},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="informant != null">#{informant},</if>
+            <if test="inforTime != null">#{inforTime},</if>
+            <if test="informantPhone != null">#{informantPhone},</if>
+            <if test="describe != null">#{describe},</if>
+            <if test="status != null">#{status},</if>
+            <if test="enterpriseId != null">#{enterpriseId},</if>
+            <if test="enterpriseName != null">#{enterpriseName},</if>
+            <if test="remarks != null">#{remarks},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createTime != null">#{createTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTEventReceive" parameterType="TEventReceive">
+        update t_event_receive
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="eventName != null">event_name = #{eventName},</if>
+            <if test="eventType != null">event_type = #{eventType},</if>
+            <if test="eventGrade != null">event_grade = #{eventGrade},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="informant != null">informant = #{informant},</if>
+            <if test="inforTime != null">infor_time = #{inforTime},</if>
+            <if test="informantPhone != null">informant_phone = #{informantPhone},</if>
+            <if test="describe != null">`describe` = #{describe},</if>
+            <if test="status != null">`status` = #{status},</if>
+            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
+            <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteTEventReceiveById" parameterType="String">
+        delete from t_event_receive where id = #{id}
+    </delete>
+
+    <delete id="deleteTEventReceiveByIds" parameterType="String">
+        delete from t_event_receive where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TVehicleInfoMapper.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.TVehicleInfoMapper">
+    
+    <resultMap type="TVehicleInfo" id="TVehicleInfoResult">
+        <result property="vehicleId"    column="vehicle_id"    />
+        <result property="carNum"    column="car_num"    />
+        <result property="brandModel"    column="brand_model"    />
+        <result property="vehicleType"    column="vehicle_type"    />
+        <result property="vehicleLoad"    column="vehicle_load"    />
+        <result property="vehicleSize"    column="vehicle_size"    />
+        <result property="vehicleLimt"    column="vehicle_limt"    />
+        <result property="vehicleInspect"    column="vehicle_inspect"    />
+        <result property="beyondEnterpriseId"    column="beyond_enterprise_id"    />
+        <result property="personLiable"    column="person_liable"    />
+        <result property="phone"    column="phone"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTVehicleInfoVo">
+        select vehicle_id, car_num, brand_model, vehicle_type, vehicle_load, vehicle_size, vehicle_limt, vehicle_inspect, beyond_enterprise_id, person_liable, phone, is_del, remarks from t_vehicle_info
+    </sql>
+
+    <select id="selectTVehicleInfoList" parameterType="TVehicleInfo" resultMap="TVehicleInfoResult">
+        <include refid="selectTVehicleInfoVo"/>
+        <where>  
+            <if test="carNum != null  and carNum != ''"> and car_num like concat('%', #{carNum}, '%') </if>
+            <if test="brandModel != null  and brandModel != ''"> and brand_model = #{brandModel}</if>
+            <if test="vehicleType != null  and vehicleType != ''"> and vehicle_type = #{vehicleType}</if>
+            <if test="vehicleLoad != null  and vehicleLoad != ''"> and vehicle_load = #{vehicleLoad}</if>
+            <if test="vehicleSize != null  and vehicleSize != ''"> and vehicle_size = #{vehicleSize}</if>
+            <if test="vehicleLimt != null  and vehicleLimt != ''"> and vehicle_limt = #{vehicleLimt}</if>
+            <if test="vehicleInspect != null  and vehicleInspect != ''"> and vehicle_inspect = #{vehicleInspect}</if>
+            <if test="beyondEnterpriseId != null  and beyondEnterpriseId != ''"> and beyond_enterprise_id = #{beyondEnterpriseId}</if>
+            <if test="personLiable != null  and personLiable != ''"> and person_liable = #{personLiable}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTVehicleInfoById" parameterType="Long" resultMap="TVehicleInfoResult">
+        <include refid="selectTVehicleInfoVo"/>
+        where vehicle_id = #{vehicleId}
+    </select>
+        
+    <insert id="insertTVehicleInfo" parameterType="TVehicleInfo" useGeneratedKeys="true" keyProperty="vehicleId">
+        insert into t_vehicle_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="carNum != null">car_num,</if>
+            <if test="brandModel != null">brand_model,</if>
+            <if test="vehicleType != null">vehicle_type,</if>
+            <if test="vehicleLoad != null">vehicle_load,</if>
+            <if test="vehicleSize != null">vehicle_size,</if>
+            <if test="vehicleLimt != null">vehicle_limt,</if>
+            <if test="vehicleInspect != null">vehicle_inspect,</if>
+            <if test="beyondEnterpriseId != null">beyond_enterprise_id,</if>
+            <if test="personLiable != null">person_liable,</if>
+            <if test="phone != null">phone,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="carNum != null">#{carNum},</if>
+            <if test="brandModel != null">#{brandModel},</if>
+            <if test="vehicleType != null">#{vehicleType},</if>
+            <if test="vehicleLoad != null">#{vehicleLoad},</if>
+            <if test="vehicleSize != null">#{vehicleSize},</if>
+            <if test="vehicleLimt != null">#{vehicleLimt},</if>
+            <if test="vehicleInspect != null">#{vehicleInspect},</if>
+            <if test="beyondEnterpriseId != null">#{beyondEnterpriseId},</if>
+            <if test="personLiable != null">#{personLiable},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTVehicleInfo" parameterType="TVehicleInfo">
+        update t_vehicle_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="carNum != null">car_num = #{carNum},</if>
+            <if test="brandModel != null">brand_model = #{brandModel},</if>
+            <if test="vehicleType != null">vehicle_type = #{vehicleType},</if>
+            <if test="vehicleLoad != null">vehicle_load = #{vehicleLoad},</if>
+            <if test="vehicleSize != null">vehicle_size = #{vehicleSize},</if>
+            <if test="vehicleLimt != null">vehicle_limt = #{vehicleLimt},</if>
+            <if test="vehicleInspect != null">vehicle_inspect = #{vehicleInspect},</if>
+            <if test="beyondEnterpriseId != null">beyond_enterprise_id = #{beyondEnterpriseId},</if>
+            <if test="personLiable != null">person_liable = #{personLiable},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where vehicle_id = #{vehicleId}
+    </update>
+
+    <delete id="deleteTVehicleInfoById" parameterType="Long">
+        delete from t_vehicle_info where vehicle_id = #{vehicleId}
+    </delete>
+
+    <delete id="deleteTVehicleInfoByIds" parameterType="String">
+        delete from t_vehicle_info where vehicle_id in 
+        <foreach item="vehicleId" collection="array" open="(" separator="," close=")">
+            #{vehicleId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TVehicleLocationInfoMapper.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.TVehicleLocationInfoMapper">
+    
+    <resultMap type="TVehicleLocationInfo" id="TVehicleLocationInfoResult">
+        <result property="vehicleLocationId"    column="vehicle_location_id"    />
+        <result property="carNum"    column="car_num"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="reportTime"    column="report_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTVehicleLocationInfoVo">
+        select vehicle_location_id, car_num, longitude, latitude, report_time, is_del, remarks from t_vehicle_location_info
+    </sql>
+
+    <select id="selectTVehicleLocationInfoList" parameterType="TVehicleLocationInfo" resultMap="TVehicleLocationInfoResult">
+        <include refid="selectTVehicleLocationInfoVo"/>
+        <where>  
+            <if test="carNum != null  and carNum != ''"> and car_num = #{carNum}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="beginTime != null and endTime!= null"> and report_time BETWEEN #{ beginTime } AND #{ endTime }</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+        ORDER BY report_time DESC
+        <if test="isLast">
+            limit 1
+        </if>
+    </select>
+    
+    <select id="selectTVehicleLocationInfoById" parameterType="Long" resultMap="TVehicleLocationInfoResult">
+        <include refid="selectTVehicleLocationInfoVo"/>
+        where vehicle_location_id = #{vehicleLocationId}
+    </select>
+        
+    <insert id="insertTVehicleLocationInfo" parameterType="TVehicleLocationInfo" useGeneratedKeys="true" keyProperty="vehicleLocationId">
+        insert into t_vehicle_location_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="carNum != null">car_num,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="reportTime != null">report_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="carNum != null">#{carNum},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="reportTime != null">#{reportTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTVehicleLocationInfo" parameterType="TVehicleLocationInfo">
+        update t_vehicle_location_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="carNum != null">car_num = #{carNum},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="reportTime != null">report_time = #{reportTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where vehicle_location_id = #{vehicleLocationId}
+    </update>
+
+    <delete id="deleteTVehicleLocationInfoById" parameterType="Long">
+        delete from t_vehicle_location_info where vehicle_location_id = #{vehicleLocationId}
+    </delete>
+
+    <delete id="deleteTVehicleLocationInfoByIds" parameterType="String">
+        delete from t_vehicle_location_info where vehicle_location_id in 
+        <foreach item="vehicleLocationId" collection="array" open="(" separator="," close=")">
+            #{vehicleLocationId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-web/package.json

@@ -46,6 +46,7 @@
     "js-beautify": "1.13.0",
     "js-cookie": "2.2.1",
     "jsencrypt": "3.0.0-rc.1",
+    "moment": "^2.29.1",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",

gassafetyprogress-web/src/api/operationMonitor/vehicleInfo.js

+import request from '@/utils/request'
+
+// 查询燃气车辆信息列表
+export function listInfo(query) {
+  return request({
+    url: '/system/vehicleInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+//获取车辆最终位置
+export function getLastLocation(query){
+  return request({
+    url: '/system/vehicleInfo/getLastLocation',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询燃气车辆信息详细
+export function getInfo(vehicleId) {
+  return request({
+    url: '/system/vehicleInfo/' + vehicleId,
+    method: 'get'
+  })
+}
+
+// 新增燃气车辆信息
+export function addInfo(data) {
+  return request({
+    url: '/system/vehicleInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改燃气车辆信息
+export function updateInfo(data) {
+  return request({
+    url: '/system/vehicleInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除燃气车辆信息
+export function delInfo(vehicleId) {
+  return request({
+    url: '/system/vehicleInfo/' + vehicleId,
+    method: 'delete'
+  })
+}
+
+// 导出燃气车辆信息
+export function exportInfo(query) {
+  return request({
+    url: '/system/vehicleInfo/export',
+    method: 'get',
+    params: query
+  })
+}

gassafetyprogress-web/src/api/operationMonitor/vehicleLocationInfo.js

+import request from '@/utils/request'
+
+// 查询燃气车辆位置信息列表
+export function listInfo(query) {
+  return request({
+    url: '/system/vehicleLocationInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+//获取车辆位置信息
+export function getVehicleLocations(query){
+  return request({
+    url: '/system/vehicleLocationInfo/getVehicleLocations',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询燃气车辆位置信息详细
+export function getInfo(vehicleLocationId) {
+  return request({
+    url: '/system/vehicleLocationInfo/' + vehicleLocationId,
+    method: 'get'
+  })
+}
+
+// 新增燃气车辆位置信息
+export function addInfo(data) {
+  return request({
+    url: '/system/vehicleLocationInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改燃气车辆位置信息
+export function updateInfo(data) {
+  return request({
+    url: '/system/vehicleLocationInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除燃气车辆位置信息
+export function delInfo(vehicleLocationId) {
+  return request({
+    url: '/system/vehicleLocationInfo/' + vehicleLocationId,
+    method: 'delete'
+  })
+}
+
+// 导出燃气车辆位置信息
+export function exportInfo(query) {
+  return request({
+    url: '/system/vehicleLocationInfo/export',
+    method: 'get',
+    params: query
+  })
+}

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

+import request from '@/utils/request'
+
+// 查询应急设备列表
+export function listDevice(query) {
+  return request({
+    url: '/system/device/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询应急设备详细
+export function getDevice(id) {
+  return request({
+    url: '/system/device/' + id,
+    method: 'get'
+  })
+}
+
+// 新增应急设备
+export function addDevice(data) {
+  return request({
+    url: '/system/device',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改应急设备
+export function updateDevice(data) {
+  return request({
+    url: '/system/device',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除应急设备
+export function delDevice(id) {
+  return request({
+    url: '/system/device/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出应急设备
+export function exportDevice(query) {
+  return request({
+    url: '/system/device/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

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

+import request from '@/utils/request'
+
+// 查询事件处置列表
+export function listHandle(query) {
+  return request({
+    url: '/system/handle/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询事件处置详细
+export function getHandle(handleId) {
+  return request({
+    url: '/system/handle/' + handleId,
+    method: 'get'
+  })
+}
+
+// 新增事件处置
+export function addHandle(data) {
+  return request({
+    url: '/system/handle',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改事件处置
+export function updateHandle(data) {
+  return request({
+    url: '/system/handle',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除事件处置
+export function delHandle(handleId) {
+  return request({
+    url: '/system/handle/' + handleId,
+    method: 'delete'
+  })
+}
+
+// 导出事件处置
+export function exportHandle(query) {
+  return request({
+    url: '/system/handle/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

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

+import request from '@/utils/request'
+
+// 查询事件接报列表
+export function listReceive(query) {
+  return request({
+    url: '/system/receive/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询事件接报详细
+export function getReceive(id) {
+  return request({
+    url: '/system/receive/' + id,
+    method: 'get'
+  })
+}
+
+// 新增事件接报
+export function addReceive(data) {
+  return request({
+    url: '/system/receive',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改事件接报
+export function updateReceive(data) {
+  return request({
+    url: '/system/receive',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除事件接报
+export function delReceive(id) {
+  return request({
+    url: '/system/receive/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出事件接报
+export function exportReceive(query) {
+  return request({
+    url: '/system/receive/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

gassafetyprogress-web/src/assets/mapImages/carTarget.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1647852854992" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2263" xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="20"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M662.04973405 329.56834123l108.40905238-142.19888693c4.22372932-5.63163908 4.22372932-11.26327817 1.40790978-18.30282702-2.81581955-5.63163908-8.44745863-9.8553684-15.48700748-9.85536841H218.55815604c-9.8553684 0-16.89491725 7.03954885-16.89491725 16.89491726V867.38987389c0 9.8553684 7.03954885 16.89491725 16.89491725 16.89491726s16.89491725-7.03954885 16.89491726-16.89491726V487.25423562h522.33452519c7.03954885 0 12.67118794-4.22372932 15.48700749-9.8553684s1.40790977-12.67118794-2.81581955-18.30282703l-108.40905238-129.52769896z" fill="#EA4942" p-id="2264"></path></svg>
\ No newline at end of file

gassafetyprogress-web/src/assets/styles/all.scss

@@ -613,7 +613,7 @@
 
     // overflow-y: none !important;
   }
-  
+
 
 }
 // map里的label
@@ -624,7 +624,7 @@
 .amap-marker-label{
     background-color: rgba(9, 18, 32, 0.6) !important;
     color: #fff !important;
-    border:none !important; 
+    border:none !important;
     padding:10px;
 }
 .left {
@@ -633,3 +633,45 @@
     overflow-y: hidden !important;
   }
 }
+
+// 后台系统右上角消息图标
+.el-badge {
+  position: relative;
+  vertical-align: middle;
+  display: inline-block;
+  margin-bottom: 25px;
+  margin-right: 25px;
+}
+.el-icon-chat-dot-round {
+  font-family: "element-icons" !important;
+  speak: none;
+  font-style: normal;
+  font-weight: 900 !important;
+  font-variant: normal;
+  text-transform: none;
+  vertical-align: text-bottom;
+  vertical-align: baseline;
+  display: inline-block;
+  -webkit-font-smoothing: antialiased;
+  display: inline-block;
+  padding: 0 8px;
+  height: 100% !important;
+  font-size: 22px;
+  color: #5a5e66;
+  -moz-osx-font-smoothing: grayscale;
+}
+.el-badge__content.is-fixed {
+  top: 15px !important;
+  right: -5px !important;
+}
+.el-badge__content {
+  padding: 0 2px !important;
+}
+//去除高德logo
+.amap-logo{
+  display: none;
+  opacity:0 !important;
+}
+.amap-copyright {
+  opacity:0;
+}

gassafetyprogress-web/src/assets/styles/gassVehiche.scss

+.gass-vehiche {
+  .el-table {
+    background-color: rgba(0, 0, 0, 0) !important;
+    .el-table__body {
+      width: 100% !important;
+    }
+    &::before {
+      height: 0px !important;
+    }
+    td {
+      border-bottom: none !important;
+    }
+
+    .el-table__header-wrapper,
+    .el-table__fixed-header-wrapper {
+      tr {
+        background-color: #213b52 !important;
+      }
+      th {
+        word-break: break-word;
+        background-color: #213b52 !important;
+        color: rgba(123, 248, 244, 1);
+        height: 30px;
+        font-size: 13px;
+        padding: 0;
+        &.is-leaf {
+          border-bottom: none;
+        }
+      }
+    }
+    .el-table__body-wrapper {
+      .el-table__row:nth-child(2n + 1) {
+        background-color: #213b52;
+        &:hover td {
+          background-color: #7bf8f430 !important;
+        }
+        td {
+          .cell {
+            // color: #525252;
+            color: rgba(123, 248, 244, 1);
+          }
+        }
+      }
+      .el-table__row:nth-child(2n) {
+        background-color:#063157 !important;
+        &:hover td {
+          background-color: #7bf8f430 !important;
+        }
+        td {
+          background-color: #213b52 !important;
+          .cell {
+
+            color: #fff;
+          }
+        }
+      }
+    }
+    .el-table__body-wrapper {
+      .el-button [class*="el-icon-"] + span {
+        // margin-left: 1px;
+      }
+    }
+  }
+
+  // 滚动条样式
+
+
+
+  .drawer{
+    ::-webkit-scrollbar {
+      width: 10px;
+      background: #012a53;
+      position: absolute;
+      top: 0;
+      //display:none
+
+    }
+    ::-webkit-scrollbar-thumb {
+      /*滚动条里面小方块*/
+      // border-radius: 10px;
+      // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+      background: #cccccccc;
+      border-radius: 8px;
+    }
+    ::-webkit-scrollbar-track {
+      /*滚动条里面轨道*/
+      // box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+      // border-radius: 10px;
+      // background-color: red;
+    }
+
+    ::-webkit-scrollbar-button:start {
+      // overflow: hidden;
+    }
+    ::-webkit-scrollbar-button:end {
+      // overflow: hidden;
+    }
+  }
+
+
+
+
+
+  .el-pagination {
+    button:disabled {
+      background-color: rgba(0, 0, 0, 0);
+    }
+    .el-pager li {
+      background-color: rgba(0, 0, 0, 0);
+      color: #fff;
+      cursor: pointer;
+      &.active {
+        color: #1890ff;
+      }
+      &:hover {
+        color: #7bf8f4;
+      }
+    }
+    .btn-prev,
+    .el-pagination .btn-next {
+      background-color: rgba(0, 0, 0, 0);
+    }
+  }
+  .el-pagination .btn-prev,
+  .el-pagination .btn-next {
+    background-color: rgba(0, 0, 0, 0);
+  }
+  // 禁用状态的左箭头
+  button[disabled] {
+    &:hover {
+      .el-icon-arrow-left,
+      .el-icon-arrow-right {
+        &::before {
+          color: #909399 !important;
+        }
+      }
+    }
+    .el-icon-arrow-left,
+    .el-icon-arrow-right {
+      &::before {
+        color: #909399;
+      }
+    }
+  }
+  button {
+    &:hover {
+      .el-icon-arrow-left,
+      .el-icon-arrow-right {
+        &::before {
+          color: #7bf8f4 !important;
+        }
+      }
+    }
+  }
+  // 平常状态下的
+  .el-icon-arrow-left,
+  .el-icon-arrow-right {
+    &::before {
+      color: #ffffff;
+    }
+  }
+  .el-pagination__jump {
+    color: #fff;
+  }
+  .el-input__inner {
+    background-color: rgba(0, 0, 0, 0);
+    border-color: #1890ff;
+    //color: #fff;
+  }
+}

gassafetyprogress-web/src/components/bigWindow/leftBar.vue

@@ -205,11 +205,12 @@
           // 绘制图表
           pieone.setOption({
               title: {
-                  text: '巡检任务完成率:'+(this.allNum.typeOne+this.allNum.typeTwo),
+                  text: '巡检任务数(个) : '+ (this.allNum.typeOne+this.allNum.typeTwo),
                   left: 'center',
                   top :20,
                   textStyle:{
-                      color: "#00ffff"
+                      color: "#00ffff",
+                      fontSize: "16"
                   }
               },
               grid: {
@@ -281,11 +282,12 @@
           });
           pietwo.setOption({
               title: {
-                  text: '隐患整治完成率:'+(this.allNum.typeOne+this.allNum.typeTwo),
+                  text: '隐患整治数(个) : '+ (this.allNum.typeOne+this.allNum.typeTwo),
                   left: 'center',
                   top :20,
                   textStyle:{
-                      color: "#00ffff"
+                      color: "#00ffff",
+                      fontSize: "16"
                   }
               },
               grid: {

gassafetyprogress-web/src/components/bigWindow/rightBar.vue

@@ -48,37 +48,93 @@
         ></div>
       </div>
     </div>
-    <div class="" style="padding: 0px 10px;">
-      <div class="yujingleft yujing" style="width: 33%;height: 90px;float: left;">
-          <div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
-            <img src="@/assets/mapinages/group786.png" alt="" style="width: 60px;height: 60px;" />
-          </div>
-          <div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
-            <p>设备预警</p>
-            <span>2</span>
-          </div>
+    <div class="" style="padding: 0px 10px">
+      <div
+        class="yujingleft yujing"
+        style="width: 33%; height: 90px; float: left"
+      >
+        <div
+          class="yujingtop"
+          style="
+            width: 70px;
+            height: 90px;
+            float: left;
+            margin-top: 15px;
+            text-align: right;
+          "
+        >
+          <img
+            src="@/assets/mapinages/group786.png"
+            alt=""
+            style="width: 50px; height: 50px"
+          />
+        </div>
+        <div
+          class="yujingbottom"
+          style="float: left; color: #cddbe4; margin-left: 10px"
+        >
+          <p>设备预警</p>
+          <span>2</span>
+        </div>
       </div>
-      <div class="yujingcenter yujing" style="width: 33%;height: 90px;float: left;">
-        <div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
-          <img src="@/assets/mapinages/group787.png" alt="" style="width: 60px;height: 60px;" />
+      <div
+        class="yujingcenter yujing"
+        style="width: 33%; height: 90px; float: left"
+      >
+        <div
+          class="yujingtop"
+          style="
+            width: 70px;
+            height: 90px;
+            float: left;
+            margin-top: 15px;
+            text-align: right;
+          "
+        >
+          <img
+            src="@/assets/mapinages/group787.png"
+            alt=""
+            style="width: 50px; height: 50px"
+          />
         </div>
-        <div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
+        <div
+          class="yujingbottom"
+          style="float: left; color: #cddbe4; margin-left: 10px"
+        >
           <p>事件情况</p>
           <span>2</span>
         </div>
       </div>
-      <div class="yujingright yujing" style="width: 33%;height: 90px;float: left;">
-        <div class="yujingtop" style="width: 70px;height: 90px;float: left;margin-top: 15px;text-align: right;">
-          <img src="@/assets/mapinages/group788.png" alt="" style="width: 60px;height: 60px;" />
+      <div
+        class="yujingright yujing"
+        style="width: 33%; height: 90px; float: left"
+      >
+        <div
+          class="yujingtop"
+          style="
+            width: 70px;
+            height: 90px;
+            float: left;
+            margin-top: 15px;
+            text-align: right;
+          "
+        >
+          <img
+            src="@/assets/mapinages/group788.png"
+            alt=""
+            style="width: 50px; height: 50px"
+          />
         </div>
-        <div class="yujingbottom" style="float: left;color: #cddbe4;margin-left: 10px;">
+        <div
+          class="yujingbottom"
+          style="float: left; color: #cddbe4; margin-left: 10px"
+        >
           <p>隐患数量</p>
           <span>2</span>
         </div>
       </div>
     </div>
 
-
     <div class="left">
       <div
         class="bottom right-bottom-data-left"
@@ -372,6 +428,10 @@ export default {
       this.drawLine3();
     });
   },
+  beforeDestroy() {
+    console.log("清空定时器");
+    clearInterval(this.alarmTimer);
+  },
   methods: {
     getAlarm() {
       return alarmData().then((response) => {
@@ -581,16 +641,13 @@ export default {
       });
     },
 
-
-
-    
     drawLine3() {
       // 基于准备好的dom，初始化echarts实例
       let myChart31 = echarts.init(document.getElementById("huanleft"));
-      let myChart32 = echarts.init(document.getElementById('huanright'))
+      let myChart32 = echarts.init(document.getElementById("huanright"));
       // 绘制图表
       myChart31.setOption({
-        color: ["#91cc75", "#5470c6", "#fa8167" ],
+        color: ["#91cc75", "#5470c6", "#fa8167"],
         grid: {
           left: 0,
           // right: 0,

gassafetyprogress-web/src/components/emergency/PipeColor.vue

+<!--
+ * @Author: your name
+ * @Date: 2022-01-26 10:52:10
+ * @LastEditTime: 2022-02-17 10:11:35
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: /test/hello-world/src/components/PipeColor.vue
+-->
+<template>
+  <div>
+    <!-- <div class="pipePressure">
+
+      <div style="float: left;margin-right: 5px;">
+        <div class="hasColorBox">
+          <img src="../../assets/image/bigtyx.svg" alt="">
+          调压箱
+        </div>
+        <div class="hasColorBox">
+          <img src="../../assets/image/bigfmj.svg" alt="">
+          阀门井
+        </div>
+        <div class="hasColorBox">
+          <img src="../../assets/image/bigcz.svg" alt="">
+          厂站
+        </div>
+        <div class="hasColorBox">
+          <img src="../../assets/image/biguser.svg" alt="">
+          用户
+        </div>
+        <div class="hasColorBox">
+          <img src="../../assets/image/bigjk.svg" alt="">
+          监控
+        </div>
+      </div>
+      <div>
+        <div class="hasColorBox" :style="{ color: pipeColor[`1`] }">
+          <div :style="{ backgroundColor: pipeColor[`1`] }"></div>
+          低压管线
+        </div>
+        <div class="hasColorBox" :style="{ color: pipeColor[`2`] }">
+          <div :style="{ backgroundColor: pipeColor[`2`] }"></div>
+          中压管线
+        </div>
+        <div class="hasColorBox" :style="{ color: pipeColor[`3`] }">
+          <div :style="{ backgroundColor: pipeColor[`3`] }"></div>
+          次高压管线
+        </div>
+        <div class="hasColorBox" :style="{ color: pipeColor[`4`] }">
+          <div :style="{ backgroundColor: pipeColor[`4`] }"></div>
+          高压管线
+        </div>
+      </div>
+    </div> -->
+
+    <div class="mapChange">
+      <div :class="{ active: mapStyle }" @click="mapChange(2)">全景地图</div>
+        <div :class="{ active: !mapStyle }" @click="mapChange(1)">卫星地图</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { pipeColor } from "@/utils/mapClass/config.js";
+export default {
+  data() {
+        downIcon: true;
+      return {
+        pipeColor,
+        mapStyle:true,
+      };
+    },
+    methods: {
+      // 更改卫星图
+      mapChange(num) {
+        if (num == 1) {
+          this.mapStyle = false;
+        } else {
+          this.mapStyle = true;
+        }
+        this.$parent.map.changeMap(this.mapStyle);
+      },
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.pipePressure {
+  width: 180px;
+  height: auto;
+  border: 1px solid #a5a5a5;
+  background-color: #112238b3;
+  position: fixed;
+  color: rgb(205, 219, 228);
+  left: 460px;
+  bottom: 20px;
+  padding: 5px;
+  font-size: 14px;
+  // background: rgba(6, 29, 51, 0.8);
+  .hasColorBox {
+    // border: 1px solid #053b6a;
+    padding: 2px 5px;
+    margin-bottom: 5px;
+    & > div {
+      display: inline-block;
+      width: 10px;
+      height: 10px;
+    }
+  }
+}
+.hasColorBox>img{
+  width: 14px;
+}
+.mapChange {
+  left: 10px;
+  top: 20px;
+  color: #fff;
+  padding: 5px;
+  position: absolute;
+  display: flex;
+  z-index: 9999;
+  div {
+    border: 1px solid #339CC9;
+    padding: 3px 6px;
+    margin-left: 8px;
+    color: #339CC9;
+    cursor: pointer;
+    font-size: 14px;
+    &.active,
+    &:hover
+    {
+      background-color: #053B6A ;
+      color: #2CD5DB;
+    }
+  }
+}
+
+</style>

gassafetyprogress-web/src/components/emergency/deviceMaterial.vue

+<!--
+ * @Author: your name
+ * @Date: 2022-01-26 20:07:52
+ * @LastEditTime: 2022-03-08 16:16:39
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+
+ * @FilePath: /test/hello-world/src/views/components/deviceA.vue
+-->
+<template>
+  <div class="devicea-wrapper">
+    <div class="title">
+      {{deviceData.deviceName}}
+    </div>
+    <div class="close" @click="close">
+      <img src="@/assets/mapImages/closeBtn.png" alt="" />
+    </div>
+
+    <div class="top flex">
+    </div>
+    <div class="middle">
+      <div class="left">
+        <div>联系人：</div>
+      </div>
+      <div v-unValue title="123" class="right">
+        {{ deviceData.contacts }}
+      </div>
+    </div>
+    <div class="middle">
+      <div class="left">
+        <div>联系电话：</div>
+      </div>
+      <div v-unValue title="123" class="right">
+        {{ deviceData.phone }}
+      </div>
+    </div>
+    <div class="middle">
+      <div class="left">
+        <div>设施地址：</div>
+      </div>
+      <div v-unValue title="123" class="right">
+        {{ deviceData.address }}
+      </div>
+    </div>
+
+    <div class="middle">
+      <div class="left">
+        <div>简介：</div>
+      </div>
+      <div v-unValue title="123" class="right">
+        {{ deviceData.introduce }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { companyType, deviceType } from "@/utils/mapClass/config.js";
+export default {
+  data() {
+    return {
+      companyType,
+      deviceType,
+      profile: "暂无备注",
+    };
+  },
+  computed: {
+    prodTest() {
+      return this.vueRoot.$store.state.user.systemSetting.prod_test;
+    },
+    company() {
+      return this.vueRoot.$store.state.bigWindowCompany.company;
+    },
+  },
+  mounted() {
+    // 如果不是测试，而是真数据，就要用帧数据的东西
+    if (this.prodTest != "test") {
+      this.companyType = {};
+      this.company.forEach((item) => {
+        this.companyType[item.conpanyId] = item.companyName;
+      });
+    }
+    console.log(this.deviceData);
+  },
+  methods: {
+    close() {
+      this.mapClass.infowindowClose();
+    },
+    btnClick() {
+      // this.vueRoot.centerDataFunc(this.deviceData.pressureFlows);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.devicea-wrapper {
+  background-color: rgba(9, 18, 32, 0.6);
+  padding: 10px;
+  position: relative;
+  width: 500px;
+  .title {
+    // padding-top: 10px;
+    // padding-left: 10px;
+    font-size: 14px;
+    line-height: 14px;
+    color: #ffffff;
+  }
+  .close {
+    position: absolute;
+    right: 10px;
+    top: 5px;
+    cursor: pointer;
+  }
+
+  .top {
+    margin-top: 10px;
+    // margin-bottom: 10px;
+    border: 1px solid #cccccc;
+    box-sizing: border-box;
+    .group {
+      height: 30px;
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      box-sizing: border-box;
+      div {
+        flex: 1;
+        box-sizing: border-box;
+        border-right: 1px solid #cccccc;
+        text-align: center;
+        font-size: 14px;
+        color: #ffffff;
+        line-height: 30px;
+        padding: 0 5px;
+        &.last {
+          border-right: none;
+        }
+      }
+      .left {
+        text-align: right;
+        background-color: rgba(255, 255, 255, 0.1);
+      }
+    }
+  }
+  .middle {
+    display: flex;
+    border: 1px solid #cccccc;
+    border-top: none;
+
+    & > div {
+      box-sizing: border-box;
+      border-right: 1px solid #cccccc;
+      text-align: center;
+      font-size: 14px;
+      color: #ffffff;
+      line-height: 30px;
+      padding: 0 5px;
+
+      &.left {
+        width: 113px;
+        display: flex;
+        align-items: center;
+        background-color: rgba(255, 255, 255, 0.1);
+        div {
+          text-align: right;
+          flex: 1;
+        }
+      }
+      &.right {
+        border: none;
+        flex: 1;
+        text-align: left;
+        text-indent: 2em;
+        line-height: normal;
+        padding: 5px;
+      }
+    }
+  }
+
+  .foot {
+    width: 100%;
+    padding: 5px;
+    border: 1px solid #ffffff;
+    box-sizing: border-box;
+    font-size: 14px;
+    color: #ffffff;
+    text-indent: 2em;
+    margin-bottom: 10px;
+  }
+
+  .flex {
+    display: flex;
+    justify-content: space-between;
+  }
+}
+</style>

gassafetyprogress-web/src/layout/components/Navbar.vue

@@ -7,13 +7,17 @@
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
-        <search id="header-search" class="right-menu-item" />
+        <!-- <search id="header-search" class="right-menu-item" /> -->
+          <el-badge :value="20" :max="99" class="item">
+            <i class="el-icon-chat-dot-round" style="width: 10px;height: 10px;"></i>
+          </el-badge>
+          
 
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
-        <el-tooltip content="布局大小" effect="dark" placement="bottom">
+        <!-- <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>
+        </el-tooltip> -->
 
       </template>
 

gassafetyprogress-web/src/main.js

@@ -17,6 +17,8 @@ import "@/assets/styles/index.scss"; // global css
 import "@/assets/styles/zehong.scss"; // zehong css
 import "./assets/css/font.css";
 import "./assets/styles/all.scss";
+//燃气车辆信息页面表格
+import "./assets/styles/gassVehiche.scss";
 
 import App from "./App";
 import store from "./store";

gassafetyprogress-web/src/utils/mapClass/map.js

 /*
  * @Author: your name
  * @Date: 2022-01-11 13:45:12
- * @LastEditTime: 2022-03-18 10:59:31
+ * @LastEditTime: 2022-03-21 18:13:58
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/utils/mapClass.js
@@ -331,7 +331,11 @@ export class EditorMap {
       const data = target.getExtData();
       console.log(data);
       const name =
-        data.nickName || data.deviceName || data.videoName || data.stationName;
+        data.nickName ||
+        data.deviceName ||
+        data.videoName ||
+        data.stationName ||
+        data.time;
       target.setLabel({ content: name, direction: "top" });
     });
     device.on("mouseout", (e) => {
@@ -678,12 +682,14 @@ export class EditorMap {
    * @param {*} path 轨迹回访率丼
    * @return {*}
    */
-  backTrack(vehicleId, path) {
-    infowindowClose();
+  backTrack(vehicleId, path, times) {
+    this.infowindowClose();
+
     AMap.plugin("AMap.MoveAnimation", () => {
       let marker = this.allDevice[9].filter(
         (item) => item.getExtData().vehicleId == vehicleId
       )[0];
+
       // 绘制轨迹
       marker.polyline = new AMap.Polyline({
         map: this.map,
@@ -694,28 +700,82 @@ export class EditorMap {
         strokeWeight: 6, //线宽
         // strokeStyle: "solid"  //线样式
       });
-
       marker.passedPolyline = new AMap.Polyline({
         map: this.map,
         strokeColor: "#AF5", //线颜色
         strokeWeight: 6, //线宽
       });
-
-      marker.on("moving", () => {
+      marker.on("moving", (e) => {
         marker.passedPolyline.setPath(e.passedPath);
-        this.map.setCenter(e.target.getPosition(), true);
+        // this.map.setCenter(e.target.getPosition(), true);
+        // console.log(getPosition());
+      });
+
+      // 每个path的点
+      // marker.pointArr = [];
+      // carTarget
+
+      //点击的时候，先传进来一个点
+      const carPathData = { ...marker.getExtData(), time: times[0] };
+      carPathData.iconType = 14;
+      this.addDevice(carPathData, null);
+      // marker.pointArr.push(point);
+
+      marker.on("moveend", (e) => {
+        // this.addDevice(carPathData,carBackComponent);
+        // 如果不是最后一个点，就创建一个新的worderpoint，如果是就不创建，并且把自身删除
+
+        let z = {
+          longitude: e.pos[0],
+          latitude: e.pos[1],
+          iconType: 14,
+          time: times[e.index],
+        };
+        // if (e.index == path.length - 1) {
+        //  point = this.addDevice(z, null);
+        // } else {
+        this.addDevice(z, null);
+        // workPoint.infoWindow.open(map,e.passedPos);
+        // }
+        console.log("定点", e);
+      });
+
+      marker.moveAlong(path, {
+        // 每一段的时长
+        duration: 8000, //可根据实际采集时间间隔设置
+        // JSAPI2.0 是否延道路自动设置角度在 moveAlong 里设置
+        autoRotation: true,
       });
     });
   }
+
   clearbackTrack(vehicleId) {
-    let marker = this.allDevice[9].filter(
-      (item) => item.getExtData().vehicleId == vehicleId
-    )[0];
-    if (marker) {
-      this.map.remove(marker);
-      this.map.remove(marker.polyline);
-      this.map.remove(marker.passedPolyline);
-      infowindowClose();
-    }
+    // let marker = this.allDevice[9].filter(
+    //   (item) => item.getExtData().vehicleId == vehicleId
+    // )[0];
+    this.allDevice["9"]?.forEach((item) => {
+      if (item) {
+        // 停止运动
+        item.stopMove();
+        // 删除每个点
+        console.log(item.pointArr);
+
+        if (item.polyline) {
+          this.map.remove(item.polyline);
+        }
+        if (item.passedPolyline) {
+          this.map.remove(item.passedPolyline);
+        }
+        this.map.remove(item);
+      }
+    });
+    // 最后把数组清空
+    this.allDevice["9"] = [];
+    // 把car的路径点也清空
+    this.allDevice["14"]?.forEach((iten) => {
+      this.map.remove(iten);
+    });
+    this.allDevice["14"] = [];
+    this.infowindowClose();
   }
 }

gassafetyprogress-web/src/views/operationMonitor/gassVehicle/component/MapCar.vue

+<template>
+  <div class="devicea-wrapper">
+
+
+
+  </div>
+</template>
+
+<script>
+import moment from "moment";
+export default {
+  data() {
+    return {
+    };
+  },
+  mounted() {
+    this.vueRoot.getCar(this.deviceData.carNum);
+  },
+
+};
+</script>
+
+<style lang="scss" scoped>
+
+</style>