Merge remote-tracking branch 'origin/master'

gassafetyprogress-admin/pom.xml

@@ -73,6 +73,19 @@
     <build>
         <finalName>gassafetyprogress-${project.version}</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.3.RELEASE</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TAirChargeRecordController.java

+package com.zehong.web.controller.gasBottleTrack;
+
+import java.util.List;
+
+import com.zehong.system.domain.AirChargeOperatorStatistics;
+import com.zehong.system.domain.AirChargeStationStatistics;
+import com.zehong.system.domain.TGasUserInfo;
+import com.zehong.system.domain.vo.AirChargeStatisticsVo;
+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.TAirChargeRecord;
+import com.zehong.system.service.ITAirChargeRecordService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 充装记录Controller
+ * 
+ * @author zehong
+ * @date 2023-08-21
+ */
+@RestController
+@RequestMapping("/charge/record")
+public class TAirChargeRecordController extends BaseController
+{
+    @Autowired
+    private ITAirChargeRecordService tAirChargeRecordService;
+
+    /**
+     * 查询充装记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('charge:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TAirChargeRecord tAirChargeRecord)
+    {
+        startPage();
+        List<TAirChargeRecord> list = tAirChargeRecordService.selectTAirChargeRecordList(tAirChargeRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出充装记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('charge:record:export')")
+    @Log(title = "充装记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TAirChargeRecord tAirChargeRecord)
+    {
+        List<TAirChargeRecord> list = tAirChargeRecordService.selectTAirChargeRecordList(tAirChargeRecord);
+        ExcelUtil<TAirChargeRecord> util = new ExcelUtil<TAirChargeRecord>(TAirChargeRecord.class);
+        return util.exportExcel(list, "充装记录数据");
+    }
+
+    /**
+     * 获取充装记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('charge:record:query')")
+    @GetMapping(value = "/{chargeRecordId}")
+    public AjaxResult getInfo(@PathVariable("chargeRecordId") Long chargeRecordId)
+    {
+        return AjaxResult.success(tAirChargeRecordService.selectTAirChargeRecordById(chargeRecordId));
+    }
+
+    /**
+     * 新增充装记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:record:add')")
+    @Log(title = "充装记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TAirChargeRecord tAirChargeRecord)
+    {
+        return toAjax(tAirChargeRecordService.insertTAirChargeRecord(tAirChargeRecord));
+    }
+
+    /**
+     * 修改充装记录
+     */
+    @PreAuthorize("@ss.hasPermi('charge:record:edit')")
+    @Log(title = "充装记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TAirChargeRecord tAirChargeRecord)
+    {
+        return toAjax(tAirChargeRecordService.updateTAirChargeRecord(tAirChargeRecord));
+    }
+
+    /**
+     * 删除充装记录
+     */
+    @PreAuthorize("@ss.hasPermi('charge:record:remove')")
+    @Log(title = "充装记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{chargeRecordIds}")
+    public AjaxResult remove(@PathVariable Long[] chargeRecordIds)
+    {
+        return toAjax(tAirChargeRecordService.deleteTAirChargeRecordByIds(chargeRecordIds));
+    }
+
+    /**
+     * 充装记录导入
+     * @param file
+     * @param updateSupport
+     * @return
+     * @throws Exception
+     */
+    @PreAuthorize("@ss.hasPermi('charge:record:import')")
+    @Log(title = "充装记录导入", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<TAirChargeRecord> util = new ExcelUtil<>(TAirChargeRecord.class);
+        List<TAirChargeRecord> airChargeRecordList = util.importExcel(file.getInputStream());
+        String message = tAirChargeRecordService.importAirChargeRecordInfo(airChargeRecordList, updateSupport);
+        return AjaxResult.success(message);
+    }
+
+    @GetMapping("/importTemplate")
+    public AjaxResult importTemplate(){
+        ExcelUtil<TAirChargeRecord> util = new ExcelUtil<>(TAirChargeRecord.class);
+        return util.importTemplateExcel("充装记录数据");
+    }
+
+    /**
+     * 储配站充装统计
+     * @param airChargeStatisticsVo 统计实体
+     * @return
+     */
+    @GetMapping("/airChargeStationStatistics")
+    public TableDataInfo airChargeStationStatistics(AirChargeStatisticsVo airChargeStatisticsVo){
+        startPage();
+        return getDataTable(tAirChargeRecordService.airChargeStationStatistics(airChargeStatisticsVo));
+    }
+
+    @GetMapping("/airChargeStationStatisticExport")
+    public AjaxResult airChargeStationStatisticExport(AirChargeStatisticsVo airChargeStatisticsVo){
+        List<AirChargeStationStatistics> list = tAirChargeRecordService.airChargeStationStatistics(airChargeStatisticsVo);
+        ExcelUtil<AirChargeStationStatistics> util = new ExcelUtil<>(AirChargeStationStatistics.class);
+        return util.exportExcel(list, "充装统计数据");
+    }
+
+    /**
+     * 充装人员统计
+     * @param airChargeStatisticsVo 统计
+     * @return
+     */
+    @GetMapping("/airChargeOperatorStatistics")
+    public TableDataInfo airChargeOperatorStatistics(AirChargeStatisticsVo airChargeStatisticsVo){
+        startPage();
+        return getDataTable(tAirChargeRecordService.airChargeOperatorStatistics(airChargeStatisticsVo));
+    }
+
+    @GetMapping("/airChargeOperatorStatisticsExport")
+    public AjaxResult airChargeOperatorStatisticsExport(AirChargeStatisticsVo airChargeStatisticsVo){
+        List<AirChargeOperatorStatistics> list = tAirChargeRecordService.airChargeOperatorStatistics(airChargeStatisticsVo);
+        ExcelUtil<AirChargeOperatorStatistics> util = new ExcelUtil<>(AirChargeOperatorStatistics.class);
+        return util.exportExcel(list, "充装统计数据");
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasBottleInfoController.java

+package com.zehong.web.controller.gasBottleTrack;
+
+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.BottleStatistics;
+import com.zehong.system.domain.TGasBottleInfo;
+import com.zehong.system.service.ITGasBottleInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 气瓶信息Controller
+ * 
+ * @author zehong
+ * @date 2023-08-15
+ */
+@RestController
+@RequestMapping("/gasBottle/info")
+public class TGasBottleInfoController extends BaseController
+{
+    @Autowired
+    private ITGasBottleInfoService tGasBottleInfoService;
+
+    /**
+     * 查询气瓶信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottle:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TGasBottleInfo tGasBottleInfo)
+    {
+        startPage();
+        List<TGasBottleInfo> list = tGasBottleInfoService.selectTGasBottleInfoList(tGasBottleInfo);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/bottleInfoList")
+    public AjaxResult bottleInfoList(TGasBottleInfo tGasBottleInfo)
+    {
+        List<TGasBottleInfo> list = tGasBottleInfoService.selectTGasBottleInfoList(tGasBottleInfo);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 导出气瓶信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottle:info:export')")
+    @Log(title = "气瓶信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TGasBottleInfo tGasBottleInfo)
+    {
+        List<TGasBottleInfo> list = tGasBottleInfoService.selectTGasBottleInfoList(tGasBottleInfo);
+        ExcelUtil<TGasBottleInfo> util = new ExcelUtil<TGasBottleInfo>(TGasBottleInfo.class);
+        return util.exportExcel(list, "气瓶信息数据");
+    }
+
+    /**
+     * 获取气瓶信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottle:info:query')")
+    @GetMapping(value = "/{bottleId}")
+    public AjaxResult getInfo(@PathVariable("bottleId") Long bottleId)
+    {
+        return AjaxResult.success(tGasBottleInfoService.selectTGasBottleInfoById(bottleId));
+    }
+
+    /**
+     * 新增气瓶信息
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottle:info:add')")
+    @Log(title = "气瓶信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TGasBottleInfo tGasBottleInfo)
+    {
+        return toAjax(tGasBottleInfoService.insertTGasBottleInfo(tGasBottleInfo));
+    }
+
+    /**
+     * 修改气瓶信息
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottle:info:edit')")
+    @Log(title = "气瓶信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TGasBottleInfo tGasBottleInfo)
+    {
+        return toAjax(tGasBottleInfoService.updateTGasBottleInfo(tGasBottleInfo));
+    }
+
+    /**
+     * 删除气瓶信息
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottle:info:remove')")
+    @Log(title = "气瓶信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{bottleIds}")
+    public AjaxResult remove(@PathVariable Long[] bottleIds)
+    {
+        return toAjax(tGasBottleInfoService.deleteTGasBottleInfoByIds(bottleIds));
+    }
+
+    /**
+     * 气瓶导入
+     * @param file
+     * @param updateSupport
+     * @return
+     * @throws Exception
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottle:info:import')")
+    @Log(title = "气瓶导入", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<TGasBottleInfo> util = new ExcelUtil<>(TGasBottleInfo.class);
+        List<TGasBottleInfo> tGasBottleInfoList = util.importExcel(file.getInputStream());
+        String message = tGasBottleInfoService.importTGasBottleInfo(tGasBottleInfoList, updateSupport);
+        return AjaxResult.success(message);
+    }
+
+    @GetMapping("/importTemplate")
+    public AjaxResult importTemplate(){
+        ExcelUtil<TGasBottleInfo> util = new ExcelUtil<>(TGasBottleInfo.class);
+        return util.importTemplateExcel("气瓶数据");
+    }
+
+    @GetMapping("/bottleStatistics")
+    public TableDataInfo bottleStatistics(@RequestParam(value="stationId",required = false) Long stationId){
+        startPage();
+        return getDataTable(tGasBottleInfoService.bottleStatistics(stationId));
+    }
+
+    @GetMapping("/bottleStatisticsExport")
+    public AjaxResult bottleStatisticsExport(@RequestParam(value = "stationId",required = false) Long stationId)
+    {
+        List<BottleStatistics> statistics = tGasBottleInfoService.bottleStatistics(stationId);
+        ExcelUtil<BottleStatistics> util = new ExcelUtil<>(BottleStatistics.class);
+        return util.exportExcel(statistics, "气瓶信息数据");
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasBottleTrackRecordController.java

+package com.zehong.web.controller.gasBottleTrack;
+
+import java.util.List;
+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.TGasBottleTrackRecord;
+import com.zehong.system.service.ITGasBottleTrackRecordService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 气瓶追溯Controller
+ *
+ * @author zehong
+ * @date 2023-08-18
+ */
+@RestController
+@RequestMapping("/track/record")
+public class TGasBottleTrackRecordController extends BaseController
+{
+    @Autowired
+    private ITGasBottleTrackRecordService tGasBottleTrackRecordService;
+
+    /**
+     * 查询气瓶追溯列表
+     */
+    @PreAuthorize("@ss.hasPermi('track:record:list')")
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord)
+    {
+        startPage();
+        List<TGasBottleTrackRecord> list = tGasBottleTrackRecordService.selectTGasBottleTrackRecordList(tGasBottleTrackRecord);
+        return getDataTable(list);
+    }
+
+    @PostMapping("/bottleTrackRecordList")
+    public AjaxResult bottleTrackRecordList(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord)
+    {
+        List<TGasBottleTrackRecord> list = tGasBottleTrackRecordService.selectTGasBottleTrackRecordList(tGasBottleTrackRecord);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 导出气瓶追溯列表
+     */
+    @PreAuthorize("@ss.hasPermi('track:record:export')")
+    @Log(title = "气瓶追溯", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public AjaxResult export(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord)
+    {
+        List<TGasBottleTrackRecord> list = tGasBottleTrackRecordService.selectTGasBottleTrackRecordList(tGasBottleTrackRecord);
+        ExcelUtil<TGasBottleTrackRecord> util = new ExcelUtil<TGasBottleTrackRecord>(TGasBottleTrackRecord.class);
+        return util.exportExcel(list, "气瓶追溯数据");
+    }
+
+    /**
+     * 获取气瓶追溯详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('track:record:query')")
+    @GetMapping(value = "/{trackRecordId}")
+    public AjaxResult getInfo(@PathVariable("trackRecordId") Long trackRecordId)
+    {
+        return AjaxResult.success(tGasBottleTrackRecordService.selectTGasBottleTrackRecordById(trackRecordId));
+    }
+
+    /**
+     * 新增气瓶追溯
+     */
+    @PreAuthorize("@ss.hasPermi('track:record:add')")
+    @Log(title = "气瓶追溯", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord)
+    {
+        return toAjax(tGasBottleTrackRecordService.insertTGasBottleTrackRecord(tGasBottleTrackRecord));
+    }
+
+    /**
+     * 修改气瓶追溯
+     */
+    @PreAuthorize("@ss.hasPermi('track:record:edit')")
+    @Log(title = "气瓶追溯", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TGasBottleTrackRecord tGasBottleTrackRecord)
+    {
+        return toAjax(tGasBottleTrackRecordService.updateTGasBottleTrackRecord(tGasBottleTrackRecord));
+    }
+
+    /**
+     * 删除气瓶追溯
+     */
+    @PreAuthorize("@ss.hasPermi('track:record:remove')")
+    @Log(title = "气瓶追溯", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{trackRecordIds}")
+    public AjaxResult remove(@PathVariable Long[] trackRecordIds)
+    {
+        return toAjax(tGasBottleTrackRecordService.deleteTGasBottleTrackRecordByIds(trackRecordIds));
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasStorageStationInfoController.java

+package com.zehong.web.controller.gasBottleTrack;
+
+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.BaseInfoStatistics;
+import com.zehong.system.domain.TGasStorageStationInfo;
+import com.zehong.system.service.ITGasStorageStationInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 储配站信息Controller
+ * 
+ * @author zehong
+ * @date 2023-08-14
+ */
+@RestController
+@RequestMapping("/gasBottleTrack/storageStationManage")
+public class TGasStorageStationInfoController extends BaseController
+{
+    @Autowired
+    private ITGasStorageStationInfoService tGasStorageStationInfoService;
+
+    /**
+     * 查询储配站信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TGasStorageStationInfo tGasStorageStationInfo)
+    {
+        startPage();
+        List<TGasStorageStationInfo> list = tGasStorageStationInfoService.selectTGasStorageStationInfoList(tGasStorageStationInfo);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/gasStorageStationList")
+    public AjaxResult gasStorageStationList(TGasStorageStationInfo tGasStorageStationInfo){
+        List<TGasStorageStationInfo> list = tGasStorageStationInfoService.selectTGasStorageStationInfoList(tGasStorageStationInfo);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 导出储配站信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage::export')")
+    @Log(title = "储配站信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TGasStorageStationInfo tGasStorageStationInfo)
+    {
+        List<TGasStorageStationInfo> list = tGasStorageStationInfoService.selectTGasStorageStationInfoList(tGasStorageStationInfo);
+        ExcelUtil<TGasStorageStationInfo> util = new ExcelUtil<TGasStorageStationInfo>(TGasStorageStationInfo.class);
+        return util.exportExcel(list, "储配站信息数据");
+    }
+
+    /**
+     * 获取储配站信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:query')")
+    @GetMapping(value = "/{stationId}")
+    public AjaxResult getInfo(@PathVariable("stationId") Long stationId)
+    {
+        return AjaxResult.success(tGasStorageStationInfoService.selectTGasStorageStationInfoById(stationId));
+    }
+
+    /**
+     * 新增储配站信息
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:add')")
+    @Log(title = "储配站信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TGasStorageStationInfo tGasStorageStationInfo)
+    {
+        return toAjax(tGasStorageStationInfoService.insertTGasStorageStationInfo(tGasStorageStationInfo));
+    }
+
+    /**
+     * 修改储配站信息
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:edit')")
+    @Log(title = "储配站信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TGasStorageStationInfo tGasStorageStationInfo)
+    {
+        return toAjax(tGasStorageStationInfoService.updateTGasStorageStationInfo(tGasStorageStationInfo));
+    }
+
+    /**
+     * 删除储配站信息
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:remove')")
+    @Log(title = "储配站信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{stationIds}")
+    public AjaxResult remove(@PathVariable Long[] stationIds)
+    {
+        return toAjax(tGasStorageStationInfoService.deleteTGasStorageStationInfoByIds(stationIds));
+    }
+
+    /**
+     * 储配站导入
+     * @param file
+     * @param updateSupport
+     * @return
+     * @throws Exception
+     */
+    @PreAuthorize("@ss.hasPermi('gasBottleTrack:storageStationManage:import')")
+    @Log(title = "储配站维护", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<TGasStorageStationInfo> util = new ExcelUtil<>(TGasStorageStationInfo.class);
+        List<TGasStorageStationInfo> tGasStorageStationInfoList = util.importExcel(file.getInputStream());
+        String message = tGasStorageStationInfoService.importTGasStorageStationInfo(tGasStorageStationInfoList, updateSupport);
+        return AjaxResult.success(message);
+    }
+
+    @GetMapping("/importTemplate")
+    public AjaxResult importTemplate(){
+        ExcelUtil<TGasStorageStationInfo> util = new ExcelUtil<>(TGasStorageStationInfo.class);
+        return util.importTemplateExcel("储配站数据");
+    }
+
+    /**
+     * 基础信息统计
+     * @param stationId 储配站id
+     * @return
+     */
+    @GetMapping("/baseInfoStatistics")
+    public TableDataInfo baseInfoStatistics(@RequestParam(value = "stationId",required = false) Long stationId){
+        startPage();
+        return getDataTable(tGasStorageStationInfoService.baseInfoStatistics(stationId));
+    }
+
+    @GetMapping("/baseInfoStatisticsExport")
+    public AjaxResult baseInfoStatisticsExport(@RequestParam(value = "stationId",required = false) Long stationId)
+    {
+        List<BaseInfoStatistics> statistics = tGasStorageStationInfoService.baseInfoStatistics(stationId);
+        ExcelUtil<BaseInfoStatistics> util = new ExcelUtil<>(BaseInfoStatistics.class);
+        return util.exportExcel(statistics, "基础信息数据");
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TGasUserInfoController.java

+package com.zehong.web.controller.gasBottleTrack;
+
+import java.util.List;
+
+import com.zehong.system.domain.TGasBottleInfo;
+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.TGasUserInfo;
+import com.zehong.system.service.ITGasUserInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 燃气用户Controller
+ * 
+ * @author zehong
+ * @date 2023-08-17
+ */
+@RestController
+@RequestMapping("/gasUser/info")
+public class TGasUserInfoController extends BaseController
+{
+    @Autowired
+    private ITGasUserInfoService tGasUserInfoService;
+
+    /**
+     * 查询燃气用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('gasUser:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TGasUserInfo tGasUserInfo)
+    {
+        startPage();
+        List<TGasUserInfo> list = tGasUserInfoService.selectTGasUserInfoList(tGasUserInfo);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/gasUserInfoList")
+    public AjaxResult gasUserInfoList(TGasUserInfo tGasUserInfo){
+        List<TGasUserInfo> list = tGasUserInfoService.selectTGasUserInfoList(tGasUserInfo);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 导出燃气用户列表
+     */
+    @PreAuthorize("@ss.hasPermi('gasUser:info:export')")
+    @Log(title = "燃气用户", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TGasUserInfo tGasUserInfo)
+    {
+        List<TGasUserInfo> list = tGasUserInfoService.selectTGasUserInfoList(tGasUserInfo);
+        ExcelUtil<TGasUserInfo> util = new ExcelUtil<TGasUserInfo>(TGasUserInfo.class);
+        return util.exportExcel(list, "燃气用户数据");
+    }
+
+    /**
+     * 获取燃气用户详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('gasUser:info:query')")
+    @GetMapping(value = "/{gasUserId}")
+    public AjaxResult getInfo(@PathVariable("gasUserId") Long gasUserId)
+    {
+        return AjaxResult.success(tGasUserInfoService.selectTGasUserInfoById(gasUserId));
+    }
+
+    /**
+     * 新增燃气用户
+     */
+    @PreAuthorize("@ss.hasPermi('gasUser:info:add')")
+    @Log(title = "燃气用户", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TGasUserInfo tGasUserInfo)
+    {
+        return toAjax(tGasUserInfoService.insertTGasUserInfo(tGasUserInfo));
+    }
+
+    /**
+     * 修改燃气用户
+     */
+    @PreAuthorize("@ss.hasPermi('gasUser:info:edit')")
+    @Log(title = "燃气用户", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TGasUserInfo tGasUserInfo)
+    {
+        return toAjax(tGasUserInfoService.updateTGasUserInfo(tGasUserInfo));
+    }
+
+    /**
+     * 删除燃气用户
+     */
+    @PreAuthorize("@ss.hasPermi('gasUser:info:remove')")
+    @Log(title = "燃气用户", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{gasUserIds}")
+    public AjaxResult remove(@PathVariable Long[] gasUserIds)
+    {
+        return toAjax(tGasUserInfoService.deleteTGasUserInfoByIds(gasUserIds));
+    }
+
+    /**
+     * 燃气用户导入
+     * @param file
+     * @param updateSupport
+     * @return
+     * @throws Exception
+     */
+    @PreAuthorize("@ss.hasPermi('gasUser:info:import')")
+    @Log(title = "燃气用户导入", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<TGasUserInfo> util = new ExcelUtil<>(TGasUserInfo.class);
+        List<TGasUserInfo> tGasUserInfoList = util.importExcel(file.getInputStream());
+        String message = tGasUserInfoService.importTGasUserInfo(tGasUserInfoList, updateSupport);
+        return AjaxResult.success(message);
+    }
+
+    @GetMapping("/importTemplate")
+    public AjaxResult importTemplate(){
+        ExcelUtil<TGasUserInfo> util = new ExcelUtil<>(TGasUserInfo.class);
+        return util.importTemplateExcel("燃气用户数据");
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TPractitionerInfoController.java

+package com.zehong.web.controller.gasBottleTrack;
+
+import java.util.List;
+
+import com.zehong.system.domain.TGasBottleInfo;
+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.TPractitionerInfo;
+import com.zehong.system.service.ITPractitionerInfoService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 从业人员信息Controller
+ * 
+ * @author zehong
+ * @date 2023-08-16
+ */
+@RestController
+@RequestMapping("/practitioner/info")
+public class TPractitionerInfoController extends BaseController
+{
+    @Autowired
+    private ITPractitionerInfoService tPractitionerInfoService;
+
+    /**
+     * 查询从业人员信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('practitioner:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TPractitionerInfo tPractitionerInfo)
+    {
+        startPage();
+        List<TPractitionerInfo> list = tPractitionerInfoService.selectTPractitionerInfoList(tPractitionerInfo);
+        return getDataTable(list);
+    }
+
+    @GetMapping("/practitionerInfoList")
+    public AjaxResult practitionerInfoList(TPractitionerInfo tPractitionerInfo)
+    {
+        List<TPractitionerInfo> list = tPractitionerInfoService.selectTPractitionerInfoList(tPractitionerInfo);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 导出从业人员信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('practitioner:info:export')")
+    @Log(title = "从业人员信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TPractitionerInfo tPractitionerInfo)
+    {
+        List<TPractitionerInfo> list = tPractitionerInfoService.selectTPractitionerInfoList(tPractitionerInfo);
+        ExcelUtil<TPractitionerInfo> util = new ExcelUtil<TPractitionerInfo>(TPractitionerInfo.class);
+        return util.exportExcel(list, "从业人员信息数据");
+    }
+
+    /**
+     * 获取从业人员信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('practitioner:info:query')")
+    @GetMapping(value = "/{practitionerId}")
+    public AjaxResult getInfo(@PathVariable("practitionerId") Long practitionerId)
+    {
+        return AjaxResult.success(tPractitionerInfoService.selectTPractitionerInfoById(practitionerId));
+    }
+
+    /**
+     * 新增从业人员信息
+     */
+    @PreAuthorize("@ss.hasPermi('practitioner:info:add')")
+    @Log(title = "从业人员信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TPractitionerInfo tPractitionerInfo)
+    {
+        return toAjax(tPractitionerInfoService.insertTPractitionerInfo(tPractitionerInfo));
+    }
+
+    /**
+     * 修改从业人员信息
+     */
+    @PreAuthorize("@ss.hasPermi('practitioner:info:edit')")
+    @Log(title = "从业人员信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TPractitionerInfo tPractitionerInfo)
+    {
+        return toAjax(tPractitionerInfoService.updateTPractitionerInfo(tPractitionerInfo));
+    }
+
+    /**
+     * 删除从业人员信息
+     */
+    @PreAuthorize("@ss.hasPermi('practitioner:info:remove')")
+    @Log(title = "从业人员信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{practitionerIds}")
+    public AjaxResult remove(@PathVariable Long[] practitionerIds)
+    {
+        return toAjax(tPractitionerInfoService.deleteTPractitionerInfoByIds(practitionerIds));
+    }
+
+    /**
+     * 从业人员导入
+     * @param file
+     * @param updateSupport
+     * @return
+     * @throws Exception
+     */
+    @PreAuthorize("@ss.hasPermi('practitioner:info:import')")
+    @Log(title = "从业人员导入", businessType = BusinessType.IMPORT)
+    @PostMapping("/importData")
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
+    {
+        ExcelUtil<TPractitionerInfo> util = new ExcelUtil<>(TPractitionerInfo.class);
+        List<TPractitionerInfo> tPractitionerInfo = util.importExcel(file.getInputStream());
+        String message = tPractitionerInfoService.importTPractitionerInfo(tPractitionerInfo, updateSupport);
+        return AjaxResult.success(message);
+    }
+
+    @GetMapping("/importTemplate")
+    public AjaxResult importTemplate(){
+        ExcelUtil<TPractitionerInfo> util = new ExcelUtil<>(TPractitionerInfo.class);
+        return util.importTemplateExcel("从业人员数据");
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/gasBottleTrack/TSafeCheckRecordController.java

+package com.zehong.web.controller.gasBottleTrack;
+
+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.TSafeCheckRecord;
+import com.zehong.system.service.ITSafeCheckRecordService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 安检记录Controller
+ * 
+ * @author zehong
+ * @date 2023-08-21
+ */
+@RestController
+@RequestMapping("/safe/record")
+public class TSafeCheckRecordController extends BaseController
+{
+    @Autowired
+    private ITSafeCheckRecordService tSafeCheckRecordService;
+
+    /**
+     * 查询安检记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('safe:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TSafeCheckRecord tSafeCheckRecord)
+    {
+        startPage();
+        List<TSafeCheckRecord> list = tSafeCheckRecordService.selectTSafeCheckRecordList(tSafeCheckRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出安检记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('safe:record:export')")
+    @Log(title = "安检记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TSafeCheckRecord tSafeCheckRecord)
+    {
+        List<TSafeCheckRecord> list = tSafeCheckRecordService.selectTSafeCheckRecordList(tSafeCheckRecord);
+        ExcelUtil<TSafeCheckRecord> util = new ExcelUtil<TSafeCheckRecord>(TSafeCheckRecord.class);
+        return util.exportExcel(list, "安检记录数据");
+    }
+
+    /**
+     * 获取安检记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('safe:record:query')")
+    @GetMapping(value = "/{safeCheckId}")
+    public AjaxResult getInfo(@PathVariable("safeCheckId") Long safeCheckId)
+    {
+        return AjaxResult.success(tSafeCheckRecordService.selectTSafeCheckRecordById(safeCheckId));
+    }
+
+    /**
+     * 新增安检记录
+     */
+    @PreAuthorize("@ss.hasPermi('safe:record:add')")
+    @Log(title = "安检记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TSafeCheckRecord tSafeCheckRecord)
+    {
+        return toAjax(tSafeCheckRecordService.insertTSafeCheckRecord(tSafeCheckRecord));
+    }
+
+    /**
+     * 修改安检记录
+     */
+    @PreAuthorize("@ss.hasPermi('safe:record:edit')")
+    @Log(title = "安检记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TSafeCheckRecord tSafeCheckRecord)
+    {
+        return toAjax(tSafeCheckRecordService.updateTSafeCheckRecord(tSafeCheckRecord));
+    }
+
+    /**
+     * 删除安检记录
+     */
+    @PreAuthorize("@ss.hasPermi('safe:record:remove')")
+    @Log(title = "安检记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{safeCheckIds}")
+    public AjaxResult remove(@PathVariable Long[] safeCheckIds)
+    {
+        return toAjax(tSafeCheckRecordService.deleteTSafeCheckRecordByIds(safeCheckIds));
+    }
+}

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

@@ -33,6 +33,9 @@ public class TVehicleInfoController extends BaseController
     @Autowired
     private ITVehicleLocationInfoService itVehicleLocationInfoService;
 
+    @Autowired
+    private ITVehicleLocationInfoService tVehicleLocationInfoService;
+
     /**
      * 查询燃气车辆信息列表
      */
@@ -80,6 +83,8 @@ public class TVehicleInfoController extends BaseController
         return util.exportExcel(list, "燃气车辆信息数据");
     }
 
+
+
     /**
      * 获取燃气车辆信息详细信息
      */

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

 package com.zehong.web.controller.standingBook;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.zehong.system.domain.Statistics;
 import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
+import com.zehong.web.controller.tool.TimeConfig;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -47,6 +50,44 @@ public class THiddenDangerStandingBookController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 获取隐患整治台账统计信息
+     */
+    @GetMapping("/hazardStatistics")
+    public AjaxResult hazardStatistics()
+    {
+        //生成近7天数据
+        List<String> sevenDate = TimeConfig.getSevenDate();
+        List<Statistics> list=new ArrayList<>();
+        //查询统计日期和数量
+        List<Statistics> statistics = tHiddenDangerStandingBookService.hazardStatistics(TimeConfig.getSevenDate());
+        if (statistics.size()==0){
+            for (int n=0;n<7;n++){
+                Statistics statisticsn=new Statistics();
+                statisticsn.setCount(0);
+                statisticsn.setDate(sevenDate.get(n));
+                list.add(statisticsn);
+            }
+        }
+
+        for (int s=0;s<statistics.size();s++){
+            for (int i=0;i<sevenDate.size();i++){
+                Statistics statistics1=new Statistics();
+                if (statistics.get(s).getDate().equals(sevenDate.get(i))){
+                    statistics1.setCount(statistics.get(s).getCount());
+                    statistics1.setDate(sevenDate.get(i));
+                    list.add(statistics1);
+                }else {
+                    statistics1.setCount(0);
+                    statistics1.setDate(sevenDate.get(i));
+                    list.add(statistics1);
+                }
+            }
+        }
+
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出隐患整治台账列表
      */

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

 package com.zehong.web.controller.standingBook;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import com.zehong.system.domain.Statistics;
 import com.zehong.system.domain.form.TTroubleStandingBookForm;
+import com.zehong.web.controller.tool.TimeConfig;
+import com.zehong.web.timeconfig.TimeConFig;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -47,6 +51,43 @@ public class TTroubleStandingBookController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 获取事故台账统计
+     */
+    @GetMapping("/accidentLedger")
+    public AjaxResult accidentLedger()
+    {
+        List<Statistics> list=new ArrayList<>();
+        //查询统计日期和数量
+        List<Statistics> statistics = tTroubleStandingBookService.accidentLedger(TimeConfig.getSevenDate());
+        //生成近7天数据
+        List<String> sevenDate = TimeConfig.getSevenDate();
+        if (statistics.size()==0){
+            for (int n=0;n<7;n++){
+                Statistics statisticsn=new Statistics();
+                statisticsn.setCount(0);
+                statisticsn.setDate(sevenDate.get(n));
+                list.add(statisticsn);
+            }
+        }
+        for (int s=0;s<statistics.size();s++){
+            for (int i=0;i<sevenDate.size();i++){
+                Statistics statistics1=new Statistics();
+                if (statistics.get(s).getDate().equals(sevenDate.get(i))){
+                    statistics1.setCount(statistics.get(s).getCount());
+                    statistics1.setDate(sevenDate.get(i));
+                    list.add(statistics1);
+                }else {
+                    statistics1.setCount(0);
+                    statistics1.setDate(sevenDate.get(i));
+                    list.add(statistics1);
+                }
+            }
+        }
+
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出事故台账列表
      */

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/PipeInterfaceController.java

@@ -37,14 +37,14 @@ public class PipeInterfaceController extends BaseController {
         //循环根据权属单位名称分组的数据
         for (int i=0;i<pipeDatesGroup.size();i++){
              //循环全部数据
-            for (int n=0;n<pipeDates.size();n++){
-                //判断如果名称一样就一组
-                if (pipeDatesGroup.get(i).getPowerCompany().equals(pipeDates.get(n).getPowerCompany())){
-//                    //设置分组类型
-//                    pipeDates.get(n).setCompanyType(Integer.parseInt(pipeDates.get(n).getPipeId()));
-                    pipeDates.get(n).setIconType(1);
-                }
-            }
+//            for (int n=0;n<pipeDates.size();n++){
+//                //判断如果名称一样就一组
+//                if (pipeDatesGroup.get(i).getPowerCompany().equals(pipeDates.get(n).getPowerCompany())){
+////                    //设置分组类型
+////                    pipeDates.get(n).setCompanyType(Integer.parseInt(pipeDates.get(n).getPipeId()));
+//                    pipeDates.get(n).setIconType(1);
+//                }
+//            }
             k++;
         }
         PipeList pipeList=new PipeList();

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TDetectorUserController.java

@@ -51,6 +51,17 @@ public class TDetectorUserController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 获取燃气用户统计信息
+     */
+    @GetMapping("/userStatistics")
+    public AjaxResult userStatistics()
+    {
+        return AjaxResult.success(tDetectorUserService.userStatistics());
+    }
+
+
+
     /**
      * 获取探测器用户列表
      * @return

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/TEnterpriseInfoController.java

@@ -49,6 +49,16 @@ public class TEnterpriseInfoController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询企业类型
+     * @return
+     */
+//    @RequestMapping("/getEnterpriseType")
+//    public TableDataInfo getEnterpriseType(){
+//        List<TEnterpriseInfo> enterpriseType = tEnterpriseInfoService.getEnterpriseType();
+//        return getDataTable(enterpriseType);
+//    }
+
     /**
      *查询所有企业信息
      * @param tEnterpriseInfo

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/system/SysLoginController.java

 package com.zehong.web.controller.system;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
 import com.zehong.framework.systemsetting.SystemSetting;
+import com.zehong.framework.web.domain.server.Sys;
 import com.zehong.system.service.ISysPostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -79,11 +81,14 @@ public class SysLoginController
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
+        HashMap hashMap=new HashMap();
+        hashMap.put("map_center","[118.168541,39.838353]");
+        hashMap.put("prod_test","prod");
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
-        ajax.put("systemSetting",systemSetting.getSystemWebSetting());
+        ajax.put("systemSetting",hashMap);
         ajax.put("posts",iSysPostService.getPostListByUserId(user.getUserId()));
         return ajax;
     }

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/system/TDeliveryRecordController.java

+package com.zehong.web.controller.system;
+
+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.TDeliveryRecord;
+import com.zehong.system.service.ITDeliveryRecordService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 配送记录Controller
+ *
+ * @author zehong
+ * @date 2023-08-22
+ */
+@RestController
+@RequestMapping("/system/recordn")
+public class TDeliveryRecordController extends BaseController
+{
+    @Autowired
+    private ITDeliveryRecordService tDeliveryRecordService;
+
+    /**
+     * 查询配送记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TDeliveryRecord tDeliveryRecord)
+    {
+        startPage();
+        List<TDeliveryRecord> list = tDeliveryRecordService.selectTDeliveryRecordList(tDeliveryRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出配送记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:record:export')")
+    @Log(title = "配送记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TDeliveryRecord tDeliveryRecord)
+    {
+        List<TDeliveryRecord> list = tDeliveryRecordService.selectTDeliveryRecordList(tDeliveryRecord);
+        ExcelUtil<TDeliveryRecord> util = new ExcelUtil<TDeliveryRecord>(TDeliveryRecord.class);
+        return util.exportExcel(list, "配送记录数据");
+    }
+
+    /**
+     * 获取配送记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:record:query')")
+    @GetMapping(value = "/{deliveryRecordId}")
+    public AjaxResult getInfo(@PathVariable("deliveryRecordId") Long deliveryRecordId)
+    {
+        return AjaxResult.success(tDeliveryRecordService.selectTDeliveryRecordById(deliveryRecordId));
+    }
+
+    /**
+     * 新增配送记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:record:add')")
+    @Log(title = "配送记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TDeliveryRecord tDeliveryRecord)
+    {
+        return toAjax(tDeliveryRecordService.insertTDeliveryRecord(tDeliveryRecord));
+    }
+
+    /**
+     * 修改配送记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:record:edit')")
+    @Log(title = "配送记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TDeliveryRecord tDeliveryRecord)
+    {
+        return toAjax(tDeliveryRecordService.updateTDeliveryRecord(tDeliveryRecord));
+    }
+
+    /**
+     * 删除配送记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:record:remove')")
+    @Log(title = "配送记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{deliveryRecordIds}")
+    public AjaxResult remove(@PathVariable Long[] deliveryRecordIds)
+    {
+        return toAjax(tDeliveryRecordService.deleteTDeliveryRecordByIds(deliveryRecordIds));
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/system/TVehicleInfosController.java

+package com.zehong.web.controller.system;
+
+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.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.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 2023-08-16
+ */
+@RestController
+@RequestMapping("/system/infos")
+public class TVehicleInfosController extends BaseController
+{
+    @Autowired
+    private ITVehicleInfoService tVehicleInfoService;
+    @Autowired
+    private ITVehicleLocationInfoService itVehicleLocationInfoService;
+    /**
+     * 查询燃气车辆信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TVehicleInfo tVehicleInfo)
+    {
+        startPage();
+        List<TVehicleInfo> list = tVehicleInfoService.selectTVehicleInfoList(tVehicleInfo);
+        for (int i=0;i<list.size();i++){
+            //获取最后位置信息
+            TVehicleLocationInfo tVehicleLocationInfo = new TVehicleLocationInfo();
+            tVehicleLocationInfo.setCarNum(list.get(i).getCarNum());
+            tVehicleLocationInfo.setLast(true);
+            List<TVehicleLocationInfo> tVehicleLocationInfoList=itVehicleLocationInfoService.selectTVehicleLocationInfoList(tVehicleLocationInfo);
+            //车辆最后位置
+            if(!Collections.isEmpty(tVehicleLocationInfoList) && tVehicleLocationInfoList.size() > 0){
+                list.get(i).setLongitude(tVehicleLocationInfoList.get(0).getLongitude());
+                list.get(i).setLatitude(tVehicleLocationInfoList.get(0).getLatitude());
+            }
+        }
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出燃气车辆信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:info: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:info:query')")
+    @GetMapping(value = "/{vehicleId}")
+    public AjaxResult getInfo(@PathVariable("vehicleId") Long vehicleId)
+    {
+        return AjaxResult.success(tVehicleInfoService.selectTVehicleInfoById(vehicleId));
+    }
+
+    /**
+     * 新增燃气车辆信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:add')")
+    @Log(title = "燃气车辆信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TVehicleInfo tVehicleInfo)
+    {
+        return toAjax(tVehicleInfoService.insertTVehicleInfo(tVehicleInfo));
+    }
+
+    /**
+     * 修改燃气车辆信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info:edit')")
+    @Log(title = "燃气车辆信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TVehicleInfo tVehicleInfo)
+    {
+        return toAjax(tVehicleInfoService.updateTVehicleInfo(tVehicleInfo));
+    }
+
+    /**
+     * 删除燃气车辆信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:info: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/system/TVehicleUseRecordController.java

+package com.zehong.web.controller.system;
+
+import java.util.List;
+
+import com.zehong.common.core.domain.model.LoginUser;
+import com.zehong.common.utils.ServletUtils;
+import com.zehong.framework.web.service.TokenService;
+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.TVehicleUseRecord;
+import com.zehong.system.service.ITVehicleUseRecordService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 车辆使用记录Controller
+ *
+ * @author zehong
+ * @date 2023-08-19
+ */
+@RestController
+@RequestMapping("/system/record")
+public class TVehicleUseRecordController extends BaseController
+{
+    @Autowired
+    private ITVehicleUseRecordService tVehicleUseRecordService;
+    @Autowired
+    private TokenService tokenService;
+    /**
+     * 查询车辆使用记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:record:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TVehicleUseRecord tVehicleUseRecord)
+    {
+        startPage();
+        List<TVehicleUseRecord> list = tVehicleUseRecordService.selectTVehicleUseRecordList(tVehicleUseRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出车辆使用记录列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:record:export')")
+    @Log(title = "车辆使用记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TVehicleUseRecord tVehicleUseRecord)
+    {
+        List<TVehicleUseRecord> list = tVehicleUseRecordService.selectTVehicleUseRecordList(tVehicleUseRecord);
+        ExcelUtil<TVehicleUseRecord> util = new ExcelUtil<TVehicleUseRecord>(TVehicleUseRecord.class);
+        return util.exportExcel(list, "车辆使用记录数据");
+    }
+
+    /**
+     * 获取车辆使用记录详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:record:query')")
+    @GetMapping(value = "/{vehicleUseRecordId}")
+    public AjaxResult getInfo(@PathVariable("vehicleUseRecordId") Long vehicleUseRecordId)
+    {
+        return AjaxResult.success(tVehicleUseRecordService.selectTVehicleUseRecordById(vehicleUseRecordId));
+    }
+
+    /**
+     * 新增车辆使用记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:record:add')")
+    @Log(title = "车辆使用记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TVehicleUseRecord tVehicleUseRecord)
+    {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Long userId = loginUser.getUser().getUserId();
+        tVehicleUseRecord.setVehicleUserId(userId);
+        return toAjax(tVehicleUseRecordService.insertTVehicleUseRecord(tVehicleUseRecord));
+    }
+
+    /**
+     * 修改车辆使用记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:record:edit')")
+    @Log(title = "车辆使用记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TVehicleUseRecord tVehicleUseRecord)
+    {
+        return toAjax(tVehicleUseRecordService.updateTVehicleUseRecord(tVehicleUseRecord));
+    }
+
+    /**
+     * 删除车辆使用记录
+     */
+    @PreAuthorize("@ss.hasPermi('system:record:remove')")
+    @Log(title = "车辆使用记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{vehicleUseRecordIds}")
+    public AjaxResult remove(@PathVariable Long[] vehicleUseRecordIds)
+    {
+        return toAjax(tVehicleUseRecordService.deleteTVehicleUseRecordByIds(vehicleUseRecordIds));
+    }
+}

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/tool/TimeConfig.java

+package com.zehong.web.controller.tool;
+
+import com.zehong.common.utils.DateUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 时间工具类
+ */
+public class TimeConfig {
+
+    //获取近七天日期
+    public static List<String> getSevenDate() {
+        List<String> dateList = new ArrayList<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        for (int i = 0; i < 7; i++) {
+            Date date = DateUtils.addDays(new Date(), -i);
+            String formatDate = sdf.format(date);
+            dateList.add(formatDate);
+        }
+        return dateList;
+    }
+
+}

gassafetyprogress-admin/src/main/resources/application-dev.yml

@@ -6,9 +6,10 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: root
+                url: jdbc:mysql://36.138.180.129:3306/gas_progress_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                #url: jdbc:mysql://36.148.23.59:3306/gas_progress_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: gas_progress_db
+                password: RMtiC6YCzdLxeJJL
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -58,7 +59,7 @@ spring:
     # redis 配置
     redis:
       # 地址
-      host: localhost
+      host: 127.0.0.1
       # 端口，默认为6379
       port: 6379
       # 数据库索引
@@ -90,7 +91,7 @@ zehong:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/zehong/uploadPath，Linux配置 /home/zehong/uploadPath）
-  profile: /home/zehong/uploadPath
+  profile: D:/zehong/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

gassafetyprogress-admin/src/main/resources/application-test.yml

@@ -6,10 +6,10 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://36.138.180.129:3306/gas_progress_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://36.138.180.82:3309/gas_progress_db_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 #url: jdbc:mysql://36.148.23.59:3306/gas_progress_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: gas_progress_db
-                password: RMtiC6YCzdLxeJJL
+                username: zhkj_db_n
+                password: Fwn4B8nALmLtNh2y
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -59,13 +59,13 @@ spring:
     # redis 配置
     redis:
       # 地址
-      host: 127.0.0.1
+      host: 36.138.180.82
       # 端口，默认为6379
-      port: 6379
+      port: 63798
       # 数据库索引
-      database: 0
+      database: 6
       # 密码
-      password:
+      password: 1qaz2wsx3edc
       # 连接超时时间
       timeout: 10s
       lettuce:

gassafetyprogress-admin/src/main/resources/application.yml

@@ -26,7 +26,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles: 
-    active: test
+    active: dev
   # 文件上传
   servlet:
      multipart:

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

+package com.zehong.system.domain;
+
+import com.zehong.common.annotation.Excel;
+
+/**
+ * @author geng
+ * 充装人员统计
+ */
+public class AirChargeOperatorStatistics extends AirChargeStationStatistics {
+
+    /**充装人*/
+    @Excel(name = "充装人")
+    private String operator;
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+}

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

+package com.zehong.system.domain;
+
+import com.zehong.common.annotation.Excel;
+
+/**
+ * @author geng
+ * 充装储配站统计
+ */
+public class AirChargeStationStatistics {
+
+    private Long StationId;
+
+    /**储配站*/
+    @Excel(name = "储配站")
+    private String stationName;
+
+    /**充装气瓶数*/
+    @Excel(name = "充装气瓶数")
+    private Integer bottleNum;
+
+    /**充装总量*/
+    @Excel(name = "充装总量")
+    private Integer chargeMeasure;
+
+    /**充装统计类型*/
+    private String statisticsType;
+
+
+    public Long getStationId() {
+        return StationId;
+    }
+
+    public void setStationId(Long stationId) {
+        StationId = stationId;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public Integer getBottleNum() {
+        return bottleNum;
+    }
+
+    public void setBottleNum(Integer bottleNum) {
+        this.bottleNum = bottleNum;
+    }
+
+    public Integer getChargeMeasure() {
+        return chargeMeasure;
+    }
+
+    public void setChargeMeasure(Integer chargeMeasure) {
+        this.chargeMeasure = chargeMeasure;
+    }
+
+
+    public String getStatisticsType() {
+        return statisticsType;
+    }
+
+    public void setStatisticsType(String statisticsType) {
+        this.statisticsType = statisticsType;
+    }
+}

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

+package com.zehong.system.domain;
+
+import com.zehong.common.annotation.Excel;
+
+public class BaseInfoStatistics {
+
+    /**储配站*/
+    @Excel(name = "储配站")
+    private String stationName;
+
+    /**气瓶数量*/
+    @Excel(name = "气瓶数量")
+    private int totalBottle;
+
+    /**车辆数量*/
+    @Excel(name = "车辆数量")
+    private int totalVehicle;
+
+    /**从业人员数量*/
+    @Excel(name = "从业人员数量")
+    private int totalPractitioner;
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public int getTotalBottle() {
+        return totalBottle;
+    }
+
+    public void setTotalBottle(int totalBottle) {
+        this.totalBottle = totalBottle;
+    }
+
+    public int getTotalVehicle() {
+        return totalVehicle;
+    }
+
+    public void setTotalVehicle(int totalVehicle) {
+        this.totalVehicle = totalVehicle;
+    }
+
+    public int getTotalPractitioner() {
+        return totalPractitioner;
+    }
+
+    public void setTotalPractitioner(int totalPractitioner) {
+        this.totalPractitioner = totalPractitioner;
+    }
+
+}

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

+package com.zehong.system.domain;
+
+import com.zehong.common.annotation.Excel;
+
+public class BottleStatistics {
+
+    /** 储配站主键*/
+    private Long stationId;
+
+    /** 储配站*/
+    @Excel(name = "储配站")
+    private String stationName;
+
+    /** 气瓶数量*/
+    @Excel(name = "气瓶数量")
+    private Integer totalNum;
+
+    /** 正常数量*/
+    @Excel(name = "正常数量")
+    private Integer normalNum;
+
+    /** 逾期数量*/
+    @Excel(name = "逾期数量")
+    private Integer overNum;
+
+    /** 报废数量*/
+    @Excel(name = "报废数量")
+    private Integer junkNum;
+
+    public Long getStationId() {
+        return stationId;
+    }
+
+    public void setStationId(Long stationId) {
+        this.stationId = stationId;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public Integer getTotalNum() {
+        return totalNum;
+    }
+
+    public void setTotalNum(Integer totalNum) {
+        this.totalNum = totalNum;
+    }
+
+    public Integer getNormalNum() {
+        return normalNum;
+    }
+
+    public void setNormalNum(Integer normalNum) {
+        this.normalNum = normalNum;
+    }
+
+    public Integer getOverNum() {
+        return overNum;
+    }
+
+    public void setOverNum(Integer overNum) {
+        this.overNum = overNum;
+    }
+
+    public Integer getJunkNum() {
+        return junkNum;
+    }
+
+    public void setJunkNum(Integer junkNum) {
+        this.junkNum = junkNum;
+    }
+}

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

+package com.zehong.system.domain;
+
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * 统计封装类
+ */
+@Data
+@ToString
+public class Statistics {
+
+    private int count;
+
+    private String date;
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TAirChargeRecord.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_air_charge_record
+ * 
+ * @author zehong
+ * @date 2023-08-21
+ */
+public class TAirChargeRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 充装主键 */
+    private Long chargeRecordId;
+
+    /** 储配站主键 */
+    private Long stationId;
+
+    @Excel(name = "储配站")
+    private String stationName;
+
+    @Excel(name = "气瓶条码")
+    private String bottleCode;
+
+    private String bottleCapacity;
+
+    private String bottleStatus;
+
+    @Excel(name = "充装人员")
+    private String chargeOperatorName;
+
+    /** 气瓶主键 */
+    private Long bottleId;
+
+    /** 充装人员 */
+    private Long chargeOperator;
+
+    /** 充装量 */
+    @Excel(name = "充装量")
+    private String chargeMeasure;
+
+    /** 充装时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "充装时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date chargeDate;
+
+    /** 删除状态：0.否 1.是 */
+    private String isDel;
+
+    private Date chargeBeginTime;
+
+    private Date chargeEndTime;
+
+    public void setChargeRecordId(Long chargeRecordId) 
+    {
+        this.chargeRecordId = chargeRecordId;
+    }
+
+    public Long getChargeRecordId() 
+    {
+        return chargeRecordId;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setBottleId(Long bottleId) 
+    {
+        this.bottleId = bottleId;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getBottleCode() {
+        return bottleCode;
+    }
+
+    public void setBottleCode(String bottleCode) {
+        this.bottleCode = bottleCode;
+    }
+
+    public String getBottleCapacity() {
+        return bottleCapacity;
+    }
+
+    public void setBottleCapacity(String bottleCapacity) {
+        this.bottleCapacity = bottleCapacity;
+    }
+
+    public String getBottleStatus() {
+        return bottleStatus;
+    }
+
+    public void setBottleStatus(String bottleStatus) {
+        this.bottleStatus = bottleStatus;
+    }
+
+    public String getChargeOperatorName() {
+        return chargeOperatorName;
+    }
+
+    public void setChargeOperatorName(String chargeOperatorName) {
+        this.chargeOperatorName = chargeOperatorName;
+    }
+
+    public Long getBottleId()
+    {
+        return bottleId;
+    }
+    public void setChargeOperator(Long chargeOperator) 
+    {
+        this.chargeOperator = chargeOperator;
+    }
+
+    public Long getChargeOperator() 
+    {
+        return chargeOperator;
+    }
+    public void setChargeMeasure(String chargeMeasure) 
+    {
+        this.chargeMeasure = chargeMeasure;
+    }
+
+    public String getChargeMeasure() 
+    {
+        return chargeMeasure;
+    }
+    public void setChargeDate(Date chargeDate) 
+    {
+        this.chargeDate = chargeDate;
+    }
+
+    public Date getChargeDate() 
+    {
+        return chargeDate;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    public Date getChargeBeginTime() {
+        return chargeBeginTime;
+    }
+
+    public void setChargeBeginTime(Date chargeBeginTime) {
+        this.chargeBeginTime = chargeBeginTime;
+    }
+
+    public Date getChargeEndTime() {
+        return chargeEndTime;
+    }
+
+    public void setChargeEndTime(Date chargeEndTime) {
+        this.chargeEndTime = chargeEndTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("chargeRecordId", getChargeRecordId())
+            .append("stationId", getStationId())
+            .append("bottleId", getBottleId())
+            .append("chargeOperator", getChargeOperator())
+            .append("chargeMeasure", getChargeMeasure())
+            .append("chargeDate", getChargeDate())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TDeliveryRecord.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_delivery_record
+ *
+ * @author zehong
+ * @date 2023-08-22
+ */
+public class TDeliveryRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 配送记录主键 */
+    private Long deliveryRecordId;
+
+    /** 储配站主键 */
+    @Excel(name = "储配站主键")
+    private Long stationId;
+
+    /** 气瓶主键 */
+    @Excel(name = "气瓶主键")
+    private Long bottleId;
+
+    /** 配送人员 */
+    @Excel(name = "配送人员")
+    private String deliveryPerson;
+
+    /** 车辆代码 */
+    @Excel(name = "车辆代码")
+    private String vehicleCode;
+
+    /** 用户主键 */
+    @Excel(name = "用户主键")
+    private Long gasUserId;
+
+    /** 配送地址 */
+    @Excel(name = "配送地址")
+    private String deliveryAddress;
+
+    /** 配送时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "配送时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deliveryDate;
+
+    /** 删除状态：0.否 1.是 */
+    @Excel(name = "删除状态：0.否 1.是")
+    private String isDel;
+
+    /**
+     * 储配站名称
+     */
+    private String stationName;
+
+    /**
+     * 气瓶条码
+     */
+    private String bottleCode;
+
+    /**
+     * 气瓶规格
+     */
+    private String bottleSpecs;
+
+    /**
+     * 气瓶状态 1正常 2逾期未检 3报废
+     */
+    private Integer bottleStatus;
+
+    /**
+     * 用户名称
+     */
+    private String gasUserName;
+
+    /**
+     * 用户类型  0居民  1非居民
+     */
+    private String gasUserType;
+
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getBottleCode() {
+        return bottleCode;
+    }
+
+    public void setBottleCode(String bottleCode) {
+        this.bottleCode = bottleCode;
+    }
+
+    public String getBottleSpecs() {
+        return bottleSpecs;
+    }
+
+    public void setBottleSpecs(String bottleSpecs) {
+        this.bottleSpecs = bottleSpecs;
+    }
+
+    public Integer getBottleStatus() {
+        return bottleStatus;
+    }
+
+    public void setBottleStatus(Integer bottleStatus) {
+        this.bottleStatus = bottleStatus;
+    }
+
+    public String getGasUserName() {
+        return gasUserName;
+    }
+
+    public void setGasUserName(String gasUserName) {
+        this.gasUserName = gasUserName;
+    }
+
+    public String getGasUserType() {
+        return gasUserType;
+    }
+
+    public void setGasUserType(String gasUserType) {
+        this.gasUserType = gasUserType;
+    }
+
+    public void setDeliveryRecordId(Long deliveryRecordId)
+    {
+        this.deliveryRecordId = deliveryRecordId;
+    }
+
+    public Long getDeliveryRecordId()
+    {
+        return deliveryRecordId;
+    }
+    public void setStationId(Long stationId)
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId()
+    {
+        return stationId;
+    }
+    public void setBottleId(Long bottleId)
+    {
+        this.bottleId = bottleId;
+    }
+
+    public Long getBottleId()
+    {
+        return bottleId;
+    }
+
+    public String getDeliveryPerson() {
+        return deliveryPerson;
+    }
+
+    public void setDeliveryPerson(String deliveryPerson) {
+        this.deliveryPerson = deliveryPerson;
+    }
+
+    public void setVehicleCode(String vehicleCode)
+    {
+        this.vehicleCode = vehicleCode;
+    }
+
+    public String getVehicleCode()
+    {
+        return vehicleCode;
+    }
+    public void setGasUserId(Long gasUserId)
+    {
+        this.gasUserId = gasUserId;
+    }
+
+    public Long getGasUserId()
+    {
+        return gasUserId;
+    }
+    public void setDeliveryAddress(String deliveryAddress)
+    {
+        this.deliveryAddress = deliveryAddress;
+    }
+
+    public String getDeliveryAddress()
+    {
+        return deliveryAddress;
+    }
+    public void setDeliveryDate(Date deliveryDate)
+    {
+        this.deliveryDate = deliveryDate;
+    }
+
+    public Date getDeliveryDate()
+    {
+        return deliveryDate;
+    }
+    public void setIsDel(String isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel()
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return "TDeliveryRecord{" +
+                "deliveryRecordId=" + deliveryRecordId +
+                ", stationId=" + stationId +
+                ", bottleId=" + bottleId +
+                ", deliveryPerson=" + deliveryPerson +
+                ", vehicleCode='" + vehicleCode + '\'' +
+                ", gasUserId=" + gasUserId +
+                ", deliveryAddress='" + deliveryAddress + '\'' +
+                ", deliveryDate=" + deliveryDate +
+                ", isDel='" + isDel + '\'' +
+                ", stationName='" + stationName + '\'' +
+                ", bottleCode='" + bottleCode + '\'' +
+                ", bottleSpecs='" + bottleSpecs + '\'' +
+                ", bottleStatus=" + bottleStatus +
+                ", gasUserName='" + gasUserName + '\'' +
+                ", gasUserType='" + gasUserType + '\'' +
+                '}';
+    }
+}

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

+package com.zehong.system.domain;
+
+import lombok.Data;
+import lombok.ToString;
+
+/**
+ * 用户信息统计封装类
+ */
+@Data
+@ToString
+public class TDetectorUserCount {
+
+    /**
+     * 用户总数
+     */
+    private int totalNumberUsers;
+
+    /**
+     * 居民用户
+     */
+    private int residentUsers;
+
+    /**
+     * 商业用户
+     */
+    private int businessUser;
+
+    /**
+     * 工业用户
+     */
+    private int industrialUsers;
+
+
+
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TGasBottleInfo.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_gas_bottle_info
+ * 
+ * @author zehong
+ * @date 2023-08-15
+ */
+public class TGasBottleInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 气瓶主键 */
+    private Long bottleId;
+
+    /** 储配站 */
+
+    private Long stationId;
+
+    @Excel(name = "储配站")
+    private String stationName;
+
+    /** 气瓶条码 */
+    @Excel(name = "气瓶条码")
+    private String bottleCode;
+
+    /** 自有编号 */
+    @Excel(name = "自有编号")
+    private String myselfNum;
+
+    /** 制造单位 */
+    @Excel(name = "制造单位")
+    private String produceUnit;
+
+    /** 制造年月 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "制造年月", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date produceDate;
+
+    /** 出厂编号 */
+    @Excel(name = "出厂编号")
+    private String produceCode;
+
+    /** 1.正常 2.逾期未检 3.报废 */
+    @Excel(name = "气瓶状态：1.正常 2.逾期未检 3.报废")
+    private String bottleStatus;
+
+    /** 末次充装时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "末次充装时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lastChargeDate;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    /** 充装介质 */
+    @Excel(name = "充装介质")
+    private String chargeMedium;
+
+    /** 气瓶规格Kg/MPa */
+    @Excel(name = "气瓶规格Kg/MPa")
+    private String bottleSpecs;
+
+    /** 公称压力Mpa */
+    @Excel(name = "公称压力Mpa")
+    private String ratedPresure;
+
+    /** 气瓶容积L */
+    @Excel(name = "气瓶容积L")
+    private String bottleCapacity;
+
+    /** 壁厚 */
+    @Excel(name = "壁厚")
+    private String wallThickness;
+
+    /** 皮重 */
+    @Excel(name = "皮重")
+    private String tare;
+
+    /** 使用登记代码 */
+    @Excel(name = "使用登记代码")
+    private String useRegisterCode;
+
+    /** 登记日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "登记日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date registerDate;
+
+    /** 末检日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "末检日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date lastCheckDate;
+
+    /** 下检日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "下检日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date nextCheckDate;
+
+    /** 报废日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "报废日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date scrapDate;
+
+    /** 0.在站 1.离站 */
+    @Excel(name = "在站/离站: 0.在站 1.离站")
+    private String currentStatus;
+
+    /** 0.空瓶 1.满瓶 */
+    @Excel(name = "空满状态：0.空瓶 1.满瓶")
+    private String emptyType;
+
+    /** 删除状态：0.否 1.是 */
+    private String isDel;
+
+    private Date produceBeginTime;
+
+    private Date produceEndTime;
+
+    public void setBottleId(Long bottleId) 
+    {
+        this.bottleId = bottleId;
+    }
+
+    public Long getBottleId() 
+    {
+        return bottleId;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setBottleCode(String bottleCode) 
+    {
+        this.bottleCode = bottleCode;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getBottleCode()
+    {
+        return bottleCode;
+    }
+    public void setMyselfNum(String myselfNum) 
+    {
+        this.myselfNum = myselfNum;
+    }
+
+    public String getMyselfNum() 
+    {
+        return myselfNum;
+    }
+    public void setProduceUnit(String produceUnit) 
+    {
+        this.produceUnit = produceUnit;
+    }
+
+    public String getProduceUnit() 
+    {
+        return produceUnit;
+    }
+    public void setProduceDate(Date produceDate) 
+    {
+        this.produceDate = produceDate;
+    }
+
+    public Date getProduceDate() 
+    {
+        return produceDate;
+    }
+    public void setProduceCode(String produceCode) 
+    {
+        this.produceCode = produceCode;
+    }
+
+    public String getProduceCode() 
+    {
+        return produceCode;
+    }
+    public void setBottleStatus(String bottleStatus) 
+    {
+        this.bottleStatus = bottleStatus;
+    }
+
+    public String getBottleStatus() 
+    {
+        return bottleStatus;
+    }
+    public void setLastChargeDate(Date lastChargeDate) 
+    {
+        this.lastChargeDate = lastChargeDate;
+    }
+
+    public Date getLastChargeDate() 
+    {
+        return lastChargeDate;
+    }
+    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 setChargeMedium(String chargeMedium) 
+    {
+        this.chargeMedium = chargeMedium;
+    }
+
+    public String getChargeMedium() 
+    {
+        return chargeMedium;
+    }
+    public void setBottleSpecs(String bottleSpecs) 
+    {
+        this.bottleSpecs = bottleSpecs;
+    }
+
+    public String getBottleSpecs() 
+    {
+        return bottleSpecs;
+    }
+    public void setRatedPresure(String ratedPresure) 
+    {
+        this.ratedPresure = ratedPresure;
+    }
+
+    public String getRatedPresure() 
+    {
+        return ratedPresure;
+    }
+    public void setBottleCapacity(String bottleCapacity) 
+    {
+        this.bottleCapacity = bottleCapacity;
+    }
+
+    public String getBottleCapacity() 
+    {
+        return bottleCapacity;
+    }
+    public void setWallThickness(String wallThickness) 
+    {
+        this.wallThickness = wallThickness;
+    }
+
+    public String getWallThickness() 
+    {
+        return wallThickness;
+    }
+    public void setTare(String tare) 
+    {
+        this.tare = tare;
+    }
+
+    public String getTare() 
+    {
+        return tare;
+    }
+    public void setUseRegisterCode(String useRegisterCode) 
+    {
+        this.useRegisterCode = useRegisterCode;
+    }
+
+    public String getUseRegisterCode() 
+    {
+        return useRegisterCode;
+    }
+    public void setRegisterDate(Date registerDate) 
+    {
+        this.registerDate = registerDate;
+    }
+
+    public Date getRegisterDate() 
+    {
+        return registerDate;
+    }
+    public void setLastCheckDate(Date lastCheckDate) 
+    {
+        this.lastCheckDate = lastCheckDate;
+    }
+
+    public Date getLastCheckDate() 
+    {
+        return lastCheckDate;
+    }
+    public void setNextCheckDate(Date nextCheckDate) 
+    {
+        this.nextCheckDate = nextCheckDate;
+    }
+
+    public Date getNextCheckDate() 
+    {
+        return nextCheckDate;
+    }
+    public void setScrapDate(Date scrapDate) 
+    {
+        this.scrapDate = scrapDate;
+    }
+
+    public Date getScrapDate() 
+    {
+        return scrapDate;
+    }
+    public void setCurrentStatus(String currentStatus) 
+    {
+        this.currentStatus = currentStatus;
+    }
+
+    public String getCurrentStatus() 
+    {
+        return currentStatus;
+    }
+    public void setEmptyType(String emptyType) 
+    {
+        this.emptyType = emptyType;
+    }
+
+    public String getEmptyType() 
+    {
+        return emptyType;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    public Date getProduceBeginTime() {
+        return produceBeginTime;
+    }
+
+    public void setProduceBeginTime(Date produceBeginTime) {
+        this.produceBeginTime = produceBeginTime;
+    }
+
+    public Date getProduceEndTime() {
+        return produceEndTime;
+    }
+
+    public void setProduceEndTime(Date produceEndTime) {
+        this.produceEndTime = produceEndTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("bottleId", getBottleId())
+            .append("stationId", getStationId())
+            .append("bottleCode", getBottleCode())
+            .append("myselfNum", getMyselfNum())
+            .append("produceUnit", getProduceUnit())
+            .append("produceDate", getProduceDate())
+            .append("produceCode", getProduceCode())
+            .append("bottleStatus", getBottleStatus())
+            .append("lastChargeDate", getLastChargeDate())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("chargeMedium", getChargeMedium())
+            .append("bottleSpecs", getBottleSpecs())
+            .append("ratedPresure", getRatedPresure())
+            .append("bottleCapacity", getBottleCapacity())
+            .append("wallThickness", getWallThickness())
+            .append("tare", getTare())
+            .append("useRegisterCode", getUseRegisterCode())
+            .append("registerDate", getRegisterDate())
+            .append("lastCheckDate", getLastCheckDate())
+            .append("nextCheckDate", getNextCheckDate())
+            .append("scrapDate", getScrapDate())
+            .append("currentStatus", getCurrentStatus())
+            .append("emptyType", getEmptyType())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TGasBottleTrackRecord.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_gas_bottle_track_record
+ * 
+ * @author zehong
+ * @date 2023-08-18
+ */
+public class TGasBottleTrackRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 追溯主键 */
+    private Long trackRecordId;
+
+    /** 储配站主键 */
+    private Long stationId;
+
+    /**储配站*/
+    @Excel(name="储配站")
+    private String stationName;
+
+    /** 气瓶主键 */
+    private Long bottleId;
+
+    /**气瓶编号*/
+    @Excel(name = "气瓶条码")
+    private String bottleCode;
+
+    /**规格*/
+    @Excel(name = "气瓶规格/L")
+    private String bottleCapacity;
+
+    /** 工序名称：0.气瓶充装 1.气瓶配送 2.气瓶回收 */
+    @Excel(name = "工序名称：0.气瓶充装 1.气瓶配送 2.气瓶回收")
+    private String processesName;
+
+    /** 工序关联主键用于查看 */
+    private Long processesRelationId;
+
+    /** 操作时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date operateDate;
+
+    /** 操作人 */
+
+    private Long operator;
+
+    @Excel(name = "操作人")
+    private String operatorName;
+
+    /** 发送方 */
+    @Excel(name = "发送方")
+    private String sender;
+
+    /** 接收方 */
+    @Excel(name = "接收方")
+    private String recipient;
+
+    /** 删除状态：0.否 1.是 */
+    private String isDel;
+
+    private String messageInfo;
+
+    public void setTrackRecordId(Long trackRecordId)
+    {
+        this.trackRecordId = trackRecordId;
+    }
+
+    public Long getTrackRecordId() 
+    {
+        return trackRecordId;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setBottleId(Long bottleId) 
+    {
+        this.bottleId = bottleId;
+    }
+
+    public Long getBottleId() 
+    {
+        return bottleId;
+    }
+
+    public String getBottleCode() {
+        return bottleCode;
+    }
+
+    public void setBottleCode(String bottleCode) {
+        this.bottleCode = bottleCode;
+    }
+
+    public String getBottleCapacity() {
+        return bottleCapacity;
+    }
+
+    public void setBottleCapacity(String bottleCapacity) {
+        this.bottleCapacity = bottleCapacity;
+    }
+
+    public void setProcessesName(String processesName)
+    {
+        this.processesName = processesName;
+    }
+
+    public String getProcessesName() 
+    {
+        return processesName;
+    }
+    public void setProcessesRelationId(Long processesRelationId) 
+    {
+        this.processesRelationId = processesRelationId;
+    }
+
+    public Long getProcessesRelationId() 
+    {
+        return processesRelationId;
+    }
+    public void setOperateDate(Date operateDate) 
+    {
+        this.operateDate = operateDate;
+    }
+
+    public Date getOperateDate() 
+    {
+        return operateDate;
+    }
+    public void setOperator(Long operator) 
+    {
+        this.operator = operator;
+    }
+
+    public Long getOperator() 
+    {
+        return operator;
+    }
+
+    public String getOperatorName() {
+        return operatorName;
+    }
+
+    public void setOperatorName(String operatorName) {
+        this.operatorName = operatorName;
+    }
+
+    public void setSender(String sender)
+    {
+        this.sender = sender;
+    }
+
+    public String getSender() 
+    {
+        return sender;
+    }
+    public void setRecipient(String recipient) 
+    {
+        this.recipient = recipient;
+    }
+
+    public String getRecipient() 
+    {
+        return recipient;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getMessageInfo() {
+        return messageInfo;
+    }
+
+    public void setMessageInfo(String messageInfo) {
+        this.messageInfo = messageInfo;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("trackRecordId", getTrackRecordId())
+            .append("stationId", getStationId())
+            .append("bottleId", getBottleId())
+            .append("processesName", getProcessesName())
+            .append("processesRelationId", getProcessesRelationId())
+            .append("operateDate", getOperateDate())
+            .append("operator", getOperator())
+            .append("sender", getSender())
+            .append("recipient", getRecipient())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TGasStorageStationInfo.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_gas_storage_station_info
+ * 
+ * @author zehong
+ * @date 2023-08-14
+ */
+public class TGasStorageStationInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 储配站主键 */
+    private Long stationId;
+
+    /** 名称 */
+    @Excel(name = "储配站名称")
+    private String stationName;
+
+    /** 代码 */
+    @Excel(name = "储配站编号")
+    private String stationCode;
+
+    /** 负责人 */
+    @Excel(name = "负责人")
+    private String director;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String telNum;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String address;
+
+    /** 许可证文件 */
+    @Excel(name = "许可证文件")
+    private String licenceFile;
+
+    /** 许可证编号 */
+    @Excel(name = "许可证编号")
+    private String licenceCode;
+
+    /** 许可证有效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "许可证日期起", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date licenceEffectiveDate;
+
+    /** 许可证有效期截止日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "许可证日期止", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date licenceLimitDate;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    private Date createBeginTime;
+
+    private Date createEndTime;
+
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setStationName(String stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public String getStationName() 
+    {
+        return stationName;
+    }
+    public void setStationCode(String stationCode) 
+    {
+        this.stationCode = stationCode;
+    }
+
+    public String getStationCode() 
+    {
+        return stationCode;
+    }
+    public void setDirector(String director) 
+    {
+        this.director = director;
+    }
+
+    public String getDirector() 
+    {
+        return director;
+    }
+    public void setTelNum(String telNum) 
+    {
+        this.telNum = telNum;
+    }
+
+    public String getTelNum() 
+    {
+        return telNum;
+    }
+    public void setAddress(String address) 
+    {
+        this.address = address;
+    }
+
+    public String getAddress() 
+    {
+        return address;
+    }
+    public void setLicenceFile(String licenceFile) 
+    {
+        this.licenceFile = licenceFile;
+    }
+
+    public String getLicenceFile() 
+    {
+        return licenceFile;
+    }
+    public void setLicenceCode(String licenceCode) 
+    {
+        this.licenceCode = licenceCode;
+    }
+
+    public String getLicenceCode() 
+    {
+        return licenceCode;
+    }
+    public void setLicenceEffectiveDate(Date licenceEffectiveDate) 
+    {
+        this.licenceEffectiveDate = licenceEffectiveDate;
+    }
+
+    public Date getLicenceEffectiveDate() 
+    {
+        return licenceEffectiveDate;
+    }
+    public void setLicenceLimitDate(Date licenceLimitDate) 
+    {
+        this.licenceLimitDate = licenceLimitDate;
+    }
+
+    public Date getLicenceLimitDate() 
+    {
+        return licenceLimitDate;
+    }
+    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 Date getCreateBeginTime() {
+        return createBeginTime;
+    }
+
+    public void setCreateBeginTime(Date createBeginTime) {
+        this.createBeginTime = createBeginTime;
+    }
+
+    public Date getCreateEndTime() {
+        return createEndTime;
+    }
+
+    public void setCreateEndTime(Date createEndTime) {
+        this.createEndTime = createEndTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("stationId", getStationId())
+            .append("stationName", getStationName())
+            .append("stationCode", getStationCode())
+            .append("director", getDirector())
+            .append("telNum", getTelNum())
+            .append("address", getAddress())
+            .append("licenceFile", getLicenceFile())
+            .append("licenceCode", getLicenceCode())
+            .append("licenceEffectiveDate", getLicenceEffectiveDate())
+            .append("licenceLimitDate", getLicenceLimitDate())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TGasUserInfo.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_gas_user_info
+ * 
+ * @author zehong
+ * @date 2023-08-17
+ */
+public class TGasUserInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 燃气用户主键 */
+    private Long gasUserId;
+
+    /** 名称 */
+    @Excel(name = "用户名称")
+    private String gasUserName;
+
+    /** 代码 */
+    @Excel(name = "用户编码")
+    private String gasUserCode;
+
+    /** 0.居民 1.非居民 */
+    @Excel(name = "用户类型：0.居民 1.非居民")
+    private String gasUserType;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String telNum;
+
+    /** 0.正常 1.停用 */
+    @Excel(name = "用户状态：0.正常 1.停用")
+    private String gasUserStatus;
+
+    /** 用户地址 */
+    @Excel(name = "用户地址")
+    private String gasUserAddress;
+
+    /** 末次配送时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "末次配送时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date lastDeliveryDate;
+
+    /** 入户安检状态：0.正常入户 1.拒绝安检 */
+    @Excel(name = "入户安检状态：0.正常入户 1.拒绝安检")
+    private String gasUserCheckStatus;
+
+    /** 累计安检次数 */
+    @Excel(name = "累计安检次数")
+    private Integer totalCheckNum;
+
+    /** 删除状态：0.否 1.是 */
+    private String isDel;
+
+    public void setGasUserId(Long gasUserId) 
+    {
+        this.gasUserId = gasUserId;
+    }
+
+    public Long getGasUserId() 
+    {
+        return gasUserId;
+    }
+    public void setGasUserName(String gasUserName) 
+    {
+        this.gasUserName = gasUserName;
+    }
+
+    public String getGasUserName() 
+    {
+        return gasUserName;
+    }
+    public void setGasUserCode(String gasUserCode) 
+    {
+        this.gasUserCode = gasUserCode;
+    }
+
+    public String getGasUserCode() 
+    {
+        return gasUserCode;
+    }
+    public void setGasUserType(String gasUserType) 
+    {
+        this.gasUserType = gasUserType;
+    }
+
+    public String getGasUserType() 
+    {
+        return gasUserType;
+    }
+    public void setTelNum(String telNum) 
+    {
+        this.telNum = telNum;
+    }
+
+    public String getTelNum() 
+    {
+        return telNum;
+    }
+    public void setGasUserStatus(String gasUserStatus) 
+    {
+        this.gasUserStatus = gasUserStatus;
+    }
+
+    public String getGasUserStatus() 
+    {
+        return gasUserStatus;
+    }
+    public void setGasUserAddress(String gasUserAddress) 
+    {
+        this.gasUserAddress = gasUserAddress;
+    }
+
+    public String getGasUserAddress() 
+    {
+        return gasUserAddress;
+    }
+    public void setLastDeliveryDate(Date lastDeliveryDate) 
+    {
+        this.lastDeliveryDate = lastDeliveryDate;
+    }
+
+    public Date getLastDeliveryDate() 
+    {
+        return lastDeliveryDate;
+    }
+    public void setGasUserCheckStatus(String gasUserCheckStatus) 
+    {
+        this.gasUserCheckStatus = gasUserCheckStatus;
+    }
+
+    public String getGasUserCheckStatus() 
+    {
+        return gasUserCheckStatus;
+    }
+    public void setTotalCheckNum(Integer totalCheckNum) 
+    {
+        this.totalCheckNum = totalCheckNum;
+    }
+
+    public Integer getTotalCheckNum() 
+    {
+        return totalCheckNum;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("gasUserId", getGasUserId())
+            .append("gasUserName", getGasUserName())
+            .append("gasUserCode", getGasUserCode())
+            .append("gasUserType", getGasUserType())
+            .append("telNum", getTelNum())
+            .append("gasUserStatus", getGasUserStatus())
+            .append("gasUserAddress", getGasUserAddress())
+            .append("lastDeliveryDate", getLastDeliveryDate())
+            .append("gasUserCheckStatus", getGasUserCheckStatus())
+            .append("totalCheckNum", getTotalCheckNum())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TPractitionerInfo.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_practitioner_info
+ * 
+ * @author zehong
+ * @date 2023-08-16
+ */
+public class TPractitionerInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 从业人员主键 */
+    private Long practitionerId;
+
+    /** 储配站 */
+
+    private Long stationId;
+
+    @Excel(name = "储配站")
+    private String stationName;
+
+    /** 工号 */
+    @Excel(name = "工号")
+    private String practitionerNum;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 性别 */
+    @Excel(name = "性别: 0.男 1女")
+    private String sex;
+
+    /** 出生日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthDate;
+
+    /** 岗位 */
+
+    private Long postId;
+
+    @Excel(name = "岗位")
+    private String postName;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String telNum;
+
+    /** 配送区域 */
+    @Excel(name = "配送区域")
+    private String deliveryArea;
+
+    /** 人员照片 */
+    @Excel(name = "人员照片")
+    private String personPhoto;
+
+    /** 证书文件 */
+    @Excel(name = "证书文件")
+    private String licenseFile;
+
+    /** 从业资格编号 */
+    @Excel(name = "从业资格编号")
+    private String certificateNum;
+
+    /** 从业资格证有效时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "从业资格证有效时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date certificateEffectiveDate;
+
+    /** 密码 */
+    @Excel(name = "密码")
+    private String password;
+
+    /** 删除状态：0.否 1.是 */
+    private String isDel;
+
+    public void setPractitionerId(Long practitionerId) 
+    {
+        this.practitionerId = practitionerId;
+    }
+
+    public Long getPractitionerId() 
+    {
+        return practitionerId;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setPractitionerNum(String practitionerNum) 
+    {
+        this.practitionerNum = practitionerNum;
+    }
+
+    public String getPractitionerNum() 
+    {
+        return practitionerNum;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setSex(String sex) 
+    {
+        this.sex = sex;
+    }
+
+    public String getSex() 
+    {
+        return sex;
+    }
+    public void setBirthDate(Date birthDate) 
+    {
+        this.birthDate = birthDate;
+    }
+
+    public Date getBirthDate() 
+    {
+        return birthDate;
+    }
+    public void setPostId(Long postId) 
+    {
+        this.postId = postId;
+    }
+
+    public Long getPostId() 
+    {
+        return postId;
+    }
+    public void setTelNum(String telNum) 
+    {
+        this.telNum = telNum;
+    }
+
+    public String getTelNum() 
+    {
+        return telNum;
+    }
+    public void setDeliveryArea(String deliveryArea) 
+    {
+        this.deliveryArea = deliveryArea;
+    }
+
+    public String getDeliveryArea() 
+    {
+        return deliveryArea;
+    }
+    public void setPersonPhoto(String personPhoto) 
+    {
+        this.personPhoto = personPhoto;
+    }
+
+    public String getPersonPhoto() 
+    {
+        return personPhoto;
+    }
+    public void setLicenseFile(String licenseFile) 
+    {
+        this.licenseFile = licenseFile;
+    }
+
+    public String getLicenseFile() 
+    {
+        return licenseFile;
+    }
+    public void setCertificateNum(String certificateNum) 
+    {
+        this.certificateNum = certificateNum;
+    }
+
+    public String getCertificateNum() 
+    {
+        return certificateNum;
+    }
+    public void setCertificateEffectiveDate(Date certificateEffectiveDate) 
+    {
+        this.certificateEffectiveDate = certificateEffectiveDate;
+    }
+
+    public Date getCertificateEffectiveDate() 
+    {
+        return certificateEffectiveDate;
+    }
+    public void setPassword(String password) 
+    {
+        this.password = password;
+    }
+
+    public String getPassword() 
+    {
+        return password;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getPostName() {
+        return postName;
+    }
+
+    public void setPostName(String postName) {
+        this.postName = postName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("practitionerId", getPractitionerId())
+            .append("stationId", getStationId())
+            .append("practitionerNum", getPractitionerNum())
+            .append("name", getName())
+            .append("sex", getSex())
+            .append("birthDate", getBirthDate())
+            .append("postId", getPostId())
+            .append("telNum", getTelNum())
+            .append("deliveryArea", getDeliveryArea())
+            .append("personPhoto", getPersonPhoto())
+            .append("licenseFile", getLicenseFile())
+            .append("certificateNum", getCertificateNum())
+            .append("certificateEffectiveDate", getCertificateEffectiveDate())
+            .append("password", getPassword())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

+package com.zehong.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 安检记录对象 t_safe_check_record
+ * 
+ * @author zehong
+ * @date 2023-08-21
+ */
+public class TSafeCheckRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 安检主键 */
+    private Long safeCheckId;
+
+    /** 储配站主键 */
+
+    private Long stationId;
+
+    @Excel(name = "储配站")
+    private String stationName;
+
+    @Excel(name = "用户名称")
+    private String gasUserName;
+
+    @Excel(name = "用户类型：0.居民 1.非居民")
+    private String gasUserType;
+
+    @Excel(name = "联系方式")
+    private String telNum;
+
+
+    /** 用户主键 */
+    private Long gasUserId;
+
+    /** 安检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "安检时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date safeCheckDate;
+
+    /** 安检人 */
+    private Long safeCheckPerson;
+
+    @Excel(name = "安检人员")
+    private String safeCheckPersonName;
+
+    /** 气瓶数量 */
+    //@Excel(name = "气瓶数量")
+    private Integer bottleNum;
+
+    /** 入户状态：0.正常入户 1.拒绝安检 */
+    @Excel(name = "入户状态：0.正常入户 1.拒绝安检")
+    private String checkInStatus;
+
+    @Excel(name = "用户地址")
+    private String gasUserAddress;
+
+    /** 燃气灶具检查情况:0.合格 1.无3C认证 2.无熄火保护装置 */
+    //@Excel(name = "燃气灶具检查情况:0.合格 1.无3C认证 2.无熄火保护装置")
+    private String stoveCheckStatus;
+
+    /** 燃气灶具检查情况 */
+   // @Excel(name = "燃气灶具检查情况")
+    private String stoveCheckPic;
+
+    /** 连接软管检查情况:0.合格 1.普通橡胶软管 2.三通连接软管 3.长度超过两米且未使用硬质钢管链接 4.穿越墙体、门窗顶棚和地面 */
+    //@Excel(name = "连接软管检查情况:0.合格 1.普通橡胶软管 2.三通连接软管 3.长度超过两米且未使用硬质钢管链接 4.穿越墙体、门窗顶棚和地面")
+    private String hoseCheckStatus;
+
+    /** 连接软管检查情况 */
+    //@Excel(name = "连接软管检查情况")
+    private String hoseCheckPic;
+
+    /** 减压阀检查情况:0.合格 1.可调节 2.五自闭功能 */
+   // @Excel(name = "减压阀检查情况:0.合格 1.可调节 2.五自闭功能")
+    private String valveCheckStatus;
+
+    /** 减压阀检查情况 */
+    //@Excel(name = "减压阀检查情况")
+    private String valveCheckPic;
+
+    /** 液化气钢瓶检查情况:0.合格 1.部分有码且可追溯 2.有码但不可追溯 3.钢瓶无码 */
+    //@Excel(name = "液化气钢瓶检查情况:0.合格 1.部分有码且可追溯 2.有码但不可追溯 3.钢瓶无码")
+    private String bottleCheckStatus;
+
+    /** 液化气钢瓶检查情况 */
+    //@Excel(name = "液化气钢瓶检查情况")
+    private String bottleCheckPic;
+
+    /** 报警器加电磁切断阀检查情况:0.合格 1.有但未使用 2.有但未实现联动 3.无 4.非液化气专用报警器 5.安装位置大于0.3米 */
+    //@Excel(name = "报警器加电磁切断阀检查情况:0.合格 1.有但未使用 2.有但未实现联动 3.无 4.非液化气专用报警器 5.安装位置大于0.3米")
+    private String alarmCheckStatus;
+
+    /** 报警器加电磁切断阀检查情况 */
+    //@Excel(name = "报警器加电磁切断阀检查情况")
+    private String alarmCheckPic;
+
+    /** 用气场所检查情况:0.合格 1.高层建筑（裙房） 2.地下（半地下）室 3.车库或半地下车库 4.通风不良的场所 5.50公斤钢瓶超过两只或15公斤钢瓶超过七只未设置独立的气瓶间 */
+    //@Excel(name = "用气场所检查情况:0.合格 1.高层建筑", readConverterExp = "裙=房")
+    private String placeCheckStatus;
+
+    /** 用气场所检查情况 */
+   // @Excel(name = "用气场所检查情况")
+    private String placeCheckPic;
+
+    /** 安检人员签名 */
+   // @Excel(name = "安检人员签名")
+    private String checkPersonSign;
+
+    /** 用户签字 */
+    //@Excel(name = "用户签字")
+    private String gasUserSign;
+
+    /** 删除状态：0.否 1.是 */
+    private String isDel;
+
+    private Date safeCheckBeginTime;
+
+    private Date safeCheckEndTime;
+
+    public void setSafeCheckId(Long safeCheckId) 
+    {
+        this.safeCheckId = safeCheckId;
+    }
+
+    public Long getSafeCheckId() 
+    {
+        return safeCheckId;
+    }
+    public void setStationId(Long stationId) 
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId() 
+    {
+        return stationId;
+    }
+    public void setGasUserId(Long gasUserId) 
+    {
+        this.gasUserId = gasUserId;
+    }
+
+    public String getStationName() {
+        return stationName;
+    }
+
+    public void setStationName(String stationName) {
+        this.stationName = stationName;
+    }
+
+    public String getGasUserName() {
+        return gasUserName;
+    }
+
+    public void setGasUserName(String gasUserName) {
+        this.gasUserName = gasUserName;
+    }
+
+    public String getGasUserType() {
+        return gasUserType;
+    }
+
+    public void setGasUserType(String gasUserType) {
+        this.gasUserType = gasUserType;
+    }
+
+    public String getTelNum() {
+        return telNum;
+    }
+
+    public void setTelNum(String telNum) {
+        this.telNum = telNum;
+    }
+
+    public String getGasUserAddress() {
+        return gasUserAddress;
+    }
+
+    public void setGasUserAddress(String gasUserAddress) {
+        this.gasUserAddress = gasUserAddress;
+    }
+
+    public Long getGasUserId()
+    {
+        return gasUserId;
+    }
+    public void setSafeCheckDate(Date safeCheckDate) 
+    {
+        this.safeCheckDate = safeCheckDate;
+    }
+
+    public Date getSafeCheckDate() 
+    {
+        return safeCheckDate;
+    }
+    public void setSafeCheckPerson(Long safeCheckPerson) 
+    {
+        this.safeCheckPerson = safeCheckPerson;
+    }
+
+    public Long getSafeCheckPerson() 
+    {
+        return safeCheckPerson;
+    }
+    public void setBottleNum(Integer bottleNum) 
+    {
+        this.bottleNum = bottleNum;
+    }
+
+    public String getSafeCheckPersonName() {
+        return safeCheckPersonName;
+    }
+
+    public void setSafeCheckPersonName(String safeCheckPersonName) {
+        this.safeCheckPersonName = safeCheckPersonName;
+    }
+
+    public Integer getBottleNum()
+    {
+        return bottleNum;
+    }
+    public void setCheckInStatus(String checkInStatus) 
+    {
+        this.checkInStatus = checkInStatus;
+    }
+
+    public String getCheckInStatus() 
+    {
+        return checkInStatus;
+    }
+    public void setStoveCheckStatus(String stoveCheckStatus) 
+    {
+        this.stoveCheckStatus = stoveCheckStatus;
+    }
+
+    public String getStoveCheckStatus() 
+    {
+        return stoveCheckStatus;
+    }
+    public void setStoveCheckPic(String stoveCheckPic) 
+    {
+        this.stoveCheckPic = stoveCheckPic;
+    }
+
+    public String getStoveCheckPic() 
+    {
+        return stoveCheckPic;
+    }
+    public void setHoseCheckStatus(String hoseCheckStatus) 
+    {
+        this.hoseCheckStatus = hoseCheckStatus;
+    }
+
+    public String getHoseCheckStatus() 
+    {
+        return hoseCheckStatus;
+    }
+    public void setHoseCheckPic(String hoseCheckPic) 
+    {
+        this.hoseCheckPic = hoseCheckPic;
+    }
+
+    public String getHoseCheckPic() 
+    {
+        return hoseCheckPic;
+    }
+    public void setValveCheckStatus(String valveCheckStatus) 
+    {
+        this.valveCheckStatus = valveCheckStatus;
+    }
+
+    public String getValveCheckStatus() 
+    {
+        return valveCheckStatus;
+    }
+    public void setValveCheckPic(String valveCheckPic) 
+    {
+        this.valveCheckPic = valveCheckPic;
+    }
+
+    public String getValveCheckPic() 
+    {
+        return valveCheckPic;
+    }
+    public void setBottleCheckStatus(String bottleCheckStatus) 
+    {
+        this.bottleCheckStatus = bottleCheckStatus;
+    }
+
+    public String getBottleCheckStatus() 
+    {
+        return bottleCheckStatus;
+    }
+    public void setBottleCheckPic(String bottleCheckPic) 
+    {
+        this.bottleCheckPic = bottleCheckPic;
+    }
+
+    public String getBottleCheckPic() 
+    {
+        return bottleCheckPic;
+    }
+    public void setAlarmCheckStatus(String alarmCheckStatus) 
+    {
+        this.alarmCheckStatus = alarmCheckStatus;
+    }
+
+    public String getAlarmCheckStatus() 
+    {
+        return alarmCheckStatus;
+    }
+    public void setAlarmCheckPic(String alarmCheckPic) 
+    {
+        this.alarmCheckPic = alarmCheckPic;
+    }
+
+    public String getAlarmCheckPic() 
+    {
+        return alarmCheckPic;
+    }
+    public void setPlaceCheckStatus(String placeCheckStatus) 
+    {
+        this.placeCheckStatus = placeCheckStatus;
+    }
+
+    public String getPlaceCheckStatus() 
+    {
+        return placeCheckStatus;
+    }
+    public void setPlaceCheckPic(String placeCheckPic) 
+    {
+        this.placeCheckPic = placeCheckPic;
+    }
+
+    public String getPlaceCheckPic() 
+    {
+        return placeCheckPic;
+    }
+    public void setCheckPersonSign(String checkPersonSign) 
+    {
+        this.checkPersonSign = checkPersonSign;
+    }
+
+    public String getCheckPersonSign() 
+    {
+        return checkPersonSign;
+    }
+    public void setGasUserSign(String gasUserSign) 
+    {
+        this.gasUserSign = gasUserSign;
+    }
+
+    public String getGasUserSign() 
+    {
+        return gasUserSign;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    public Date getSafeCheckBeginTime() {
+        return safeCheckBeginTime;
+    }
+
+    public void setSafeCheckBeginTime(Date safeCheckBeginTime) {
+        this.safeCheckBeginTime = safeCheckBeginTime;
+    }
+
+    public Date getSafeCheckEndTime() {
+        return safeCheckEndTime;
+    }
+
+    public void setSafeCheckEndTime(Date safeCheckEndTime) {
+        this.safeCheckEndTime = safeCheckEndTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("safeCheckId", getSafeCheckId())
+            .append("stationId", getStationId())
+            .append("gasUserId", getGasUserId())
+            .append("safeCheckDate", getSafeCheckDate())
+            .append("safeCheckPerson", getSafeCheckPerson())
+            .append("bottleNum", getBottleNum())
+            .append("checkInStatus", getCheckInStatus())
+            .append("stoveCheckStatus", getStoveCheckStatus())
+            .append("stoveCheckPic", getStoveCheckPic())
+            .append("hoseCheckStatus", getHoseCheckStatus())
+            .append("hoseCheckPic", getHoseCheckPic())
+            .append("valveCheckStatus", getValveCheckStatus())
+            .append("valveCheckPic", getValveCheckPic())
+            .append("bottleCheckStatus", getBottleCheckStatus())
+            .append("bottleCheckPic", getBottleCheckPic())
+            .append("alarmCheckStatus", getAlarmCheckStatus())
+            .append("alarmCheckPic", getAlarmCheckPic())
+            .append("placeCheckStatus", getPlaceCheckStatus())
+            .append("placeCheckPic", getPlaceCheckPic())
+            .append("checkPersonSign", getCheckPersonSign())
+            .append("gasUserSign", getGasUserSign())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
  * 燃气车辆信息对象 t_vehicle_info
  *
  * @author zehong
- * @date 2022-03-17
+ * @date 2023-08-16
  */
 public class TVehicleInfo extends BaseEntity
 {
@@ -50,7 +50,7 @@ public class TVehicleInfo extends BaseEntity
 
     /** 所属企业 */
     @Excel(name = "所属企业")
-    private String beyondEnterpriseId;
+    private int beyondEnterpriseId;
 
     /** 责任人 */
     @Excel(name = "责任人")
@@ -69,15 +69,36 @@ public class TVehicleInfo extends BaseEntity
     private String remarks;
 
     /**
-     * 经度
+     * 储配站名称
      */
+    private String siteStationName;
+
     private BigDecimal longitude;
 
-    /**
-     * 纬度
-     */
     private BigDecimal latitude;
 
+    private String beyondEnterpriseName;
+
+
+    public String getSiteStationName() {
+        return siteStationName;
+    }
+
+    public void setSiteStationName(String siteStationName) {
+        this.siteStationName = siteStationName;
+    }
+
+    public String getBeyondEnterpriseName() {
+        return beyondEnterpriseName;
+    }
+
+    public void setBeyondEnterpriseName(String beyondEnterpriseName) {
+        this.beyondEnterpriseName = beyondEnterpriseName;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
 
     public BigDecimal getLongitude() {
         return longitude;
@@ -167,15 +188,15 @@ public class TVehicleInfo extends BaseEntity
     {
         return vehicleInspect;
     }
-    public void setBeyondEnterpriseId(String beyondEnterpriseId) 
-    {
-        this.beyondEnterpriseId = beyondEnterpriseId;
-    }
 
-    public String getBeyondEnterpriseId() 
-    {
+    public int getBeyondEnterpriseId() {
         return beyondEnterpriseId;
     }
+
+    public void setBeyondEnterpriseId(int beyondEnterpriseId) {
+        this.beyondEnterpriseId = beyondEnterpriseId;
+    }
+
     public void setPersonLiable(String personLiable)
     {
         this.personLiable = personLiable;

gassafetyprogress-system/src/main/java/com/zehong/system/domain/TVehicleUseRecord.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_vehicle_use_record
+ *
+ * @author zehong
+ * @date 2023-08-19
+ */
+public class TVehicleUseRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 车辆使用主键 */
+    private Long vehicleUseRecordId;
+
+    /** 储配站主键 */
+    @Excel(name = "储配站主键")
+    private Long stationId;
+
+    /** 车辆主键 */
+    @Excel(name = "车辆主键")
+    private Long vehicleId;
+    /** 车牌号 */
+    @Excel(name = "车牌号")
+    private String carNum;
+
+    /**
+     * 储配站名称
+     */
+    private String siteStationName;
+
+    /**
+     * 使用人姓名
+     */
+    private String name;
+
+    /**
+     * 车辆编号
+     */
+    private String vehicleCode;
+
+
+    /** 车辆使用人 */
+    @Excel(name = "车辆使用人")
+    private Long vehicleUserId;
+
+    /** 使用时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "使用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date vehicleUseDate;
+
+    /** 归还时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "归还时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date vehicleReturnDate;
+
+    /** 删除状态：0.否 1.是 */
+    @Excel(name = "删除状态：0.否 1.是")
+    private String isDel;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getCarNum() {
+        return carNum;
+    }
+
+    public void setCarNum(String carNum) {
+        this.carNum = carNum;
+    }
+
+    public String getSiteStationName() {
+        return siteStationName;
+    }
+
+    public void setSiteStationName(String siteStationName) {
+        this.siteStationName = siteStationName;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getVehicleCode() {
+        return vehicleCode;
+    }
+
+    public void setVehicleCode(String vehicleCode) {
+        this.vehicleCode = vehicleCode;
+    }
+
+    public void setVehicleUseRecordId(Long vehicleUseRecordId)
+    {
+        this.vehicleUseRecordId = vehicleUseRecordId;
+    }
+
+    public Long getVehicleUseRecordId()
+    {
+        return vehicleUseRecordId;
+    }
+    public void setStationId(Long stationId)
+    {
+        this.stationId = stationId;
+    }
+
+    public Long getStationId()
+    {
+        return stationId;
+    }
+    public void setVehicleId(Long vehicleId)
+    {
+        this.vehicleId = vehicleId;
+    }
+
+    public Long getVehicleId()
+    {
+        return vehicleId;
+    }
+    public void setVehicleUserId(Long vehicleUserId)
+    {
+        this.vehicleUserId = vehicleUserId;
+    }
+
+    public Long getVehicleUserId()
+    {
+        return vehicleUserId;
+    }
+    public void setVehicleUseDate(Date vehicleUseDate)
+    {
+        this.vehicleUseDate = vehicleUseDate;
+    }
+
+    public Date getVehicleUseDate()
+    {
+        return vehicleUseDate;
+    }
+    public void setVehicleReturnDate(Date vehicleReturnDate)
+    {
+        this.vehicleReturnDate = vehicleReturnDate;
+    }
+
+    public Date getVehicleReturnDate()
+    {
+        return vehicleReturnDate;
+    }
+    public void setIsDel(String isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel()
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return "TVehicleUseRecord{" +
+                "vehicleUseRecordId=" + vehicleUseRecordId +
+                ", stationId=" + stationId +
+                ", vehicleId=" + vehicleId +
+                ", carNum='" + carNum + '\'' +
+                ", siteStationName='" + siteStationName + '\'' +
+                ", name='" + name + '\'' +
+                ", vehicleCode='" + vehicleCode + '\'' +
+                ", vehicleUserId=" + vehicleUserId +
+                ", vehicleUseDate=" + vehicleUseDate +
+                ", vehicleReturnDate=" + vehicleReturnDate +
+                ", isDel='" + isDel + '\'' +
+                '}';
+    }
+}

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

@@ -6,6 +6,16 @@ public class TenterpriseInfoData {
 
     private String enterpriseName;
 
+    private String enterpriseType;
+
+    public String getEnterpriseType() {
+        return enterpriseType;
+    }
+
+    public void setEnterpriseType(String enterpriseType) {
+        this.enterpriseType = enterpriseType;
+    }
+
     public String getEnterpriseId() {
         return enterpriseId;
     }

gassafetyprogress-system/src/main/java/com/zehong/system/domain/vo/AirChargeStatisticsVo.java

+package com.zehong.system.domain.vo;
+
+import java.util.Date;
+
+public class AirChargeStatisticsVo {
+
+    private Long StationId;
+
+    /**充装人*/
+    private String operator;
+
+    private String statisticsType;
+
+    private Date operateBeginTime;
+
+    private Date operateEndTime;
+
+    public Long getStationId() {
+        return StationId;
+    }
+
+    public void setStationId(Long stationId) {
+        StationId = stationId;
+    }
+
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
+    public String getStatisticsType() {
+        return statisticsType;
+    }
+
+    public void setStatisticsType(String statisticsType) {
+        this.statisticsType = statisticsType;
+    }
+
+    public Date getOperateBeginTime() {
+        return operateBeginTime;
+    }
+
+    public void setOperateBeginTime(Date operateBeginTime) {
+        this.operateBeginTime = operateBeginTime;
+    }
+
+    public Date getOperateEndTime() {
+        return operateEndTime;
+    }
+
+    public void setOperateEndTime(Date operateEndTime) {
+        this.operateEndTime = operateEndTime;
+    }
+}

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

+package com.zehong.system.mapper;
+
+import com.zehong.system.domain.AirChargeOperatorStatistics;
+import com.zehong.system.domain.AirChargeStationStatistics;
+import com.zehong.system.domain.TAirChargeRecord;
+import com.zehong.system.domain.vo.AirChargeStatisticsVo;
+
+import java.util.List;
+
+/**
+ * 充装记录Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-08-21
+ */
+public interface TAirChargeRecordMapper 
+{
+    /**
+     * 查询充装记录
+     * 
+     * @param chargeRecordId 充装记录ID
+     * @return 充装记录
+     */
+    public TAirChargeRecord selectTAirChargeRecordById(Long chargeRecordId);
+
+    /**
+     * 查询充装记录列表
+     * 
+     * @param tAirChargeRecord 充装记录
+     * @return 充装记录集合
+     */
+    public List<TAirChargeRecord> selectTAirChargeRecordList(TAirChargeRecord tAirChargeRecord);
+
+    /**
+     * 新增充装记录
+     * 
+     * @param tAirChargeRecord 充装记录
+     * @return 结果
+     */
+    public int insertTAirChargeRecord(TAirChargeRecord tAirChargeRecord);
+
+    /**
+     * 修改充装记录
+     * 
+     * @param tAirChargeRecord 充装记录
+     * @return 结果
+     */
+    public int updateTAirChargeRecord(TAirChargeRecord tAirChargeRecord);
+
+    /**
+     * 删除充装记录
+     * 
+     * @param chargeRecordId 充装记录ID
+     * @return 结果
+     */
+    public int deleteTAirChargeRecordById(Long chargeRecordId);
+
+    /**
+     * 批量删除充装记录
+     * 
+     * @param chargeRecordIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTAirChargeRecordByIds(Long[] chargeRecordIds);
+
+    /**
+     * 储配站充装统计
+     * @param airChargeStatisticsVo 统计实体
+     * @return
+     */
+    List<AirChargeStationStatistics> airChargeStationStatistics(AirChargeStatisticsVo airChargeStatisticsVo);
+
+    /**
+     * 充装人员统计
+     * @param airChargeStatisticsVo 统计
+     * @return
+     */
+    List<AirChargeOperatorStatistics> airChargeOperatorStatistics(AirChargeStatisticsVo airChargeStatisticsVo);
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TDeliveryRecord;
+
+/**
+ * 配送记录Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-08-22
+ */
+public interface TDeliveryRecordMapper 
+{
+    /**
+     * 查询配送记录
+     * 
+     * @param deliveryRecordId 配送记录ID
+     * @return 配送记录
+     */
+    public TDeliveryRecord selectTDeliveryRecordById(Long deliveryRecordId);
+
+    /**
+     * 查询配送记录列表
+     * 
+     * @param tDeliveryRecord 配送记录
+     * @return 配送记录集合
+     */
+    public List<TDeliveryRecord> selectTDeliveryRecordList(TDeliveryRecord tDeliveryRecord);
+
+    /**
+     * 新增配送记录
+     * 
+     * @param tDeliveryRecord 配送记录
+     * @return 结果
+     */
+    public int insertTDeliveryRecord(TDeliveryRecord tDeliveryRecord);
+
+    /**
+     * 修改配送记录
+     * 
+     * @param tDeliveryRecord 配送记录
+     * @return 结果
+     */
+    public int updateTDeliveryRecord(TDeliveryRecord tDeliveryRecord);
+
+    /**
+     * 删除配送记录
+     * 
+     * @param deliveryRecordId 配送记录ID
+     * @return 结果
+     */
+    public int deleteTDeliveryRecordById(Long deliveryRecordId);
+
+    /**
+     * 批量删除配送记录
+     * 
+     * @param deliveryRecordIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTDeliveryRecordByIds(Long[] deliveryRecordIds);
+}

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

@@ -5,6 +5,7 @@ import java.util.Map;
 
 import com.zehong.system.domain.TDetectorInfo;
 import com.zehong.system.domain.TDetectorUser;
+import com.zehong.system.domain.TDetectorUserCount;
 import com.zehong.system.domain.vo.TDetectorUserVO;
 
 /**
@@ -90,4 +91,10 @@ public interface TDetectorUserMapper
      * @return
      */
     public  Map<String,Object> selectUserNum();
+
+    /**
+     * 查询用户统计信息
+     * @return
+     */
+    TDetectorUserCount userStatistics();
 }

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

+package com.zehong.system.mapper;
+
+import com.zehong.system.domain.BottleStatistics;
+import com.zehong.system.domain.TGasBottleInfo;
+
+import java.util.List;
+
+/**
+ * 气瓶信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-08-15
+ */
+public interface TGasBottleInfoMapper 
+{
+    /**
+     * 查询气瓶信息
+     * 
+     * @param bottleId 气瓶信息ID
+     * @return 气瓶信息
+     */
+    public TGasBottleInfo selectTGasBottleInfoById(Long bottleId);
+
+    /**
+     * 查询气瓶信息列表
+     * 
+     * @param tGasBottleInfo 气瓶信息
+     * @return 气瓶信息集合
+     */
+    public List<TGasBottleInfo> selectTGasBottleInfoList(TGasBottleInfo tGasBottleInfo);
+
+    /**
+     * 新增气瓶信息
+     * 
+     * @param tGasBottleInfo 气瓶信息
+     * @return 结果
+     */
+    public int insertTGasBottleInfo(TGasBottleInfo tGasBottleInfo);
+
+    /**
+     * 修改气瓶信息
+     * 
+     * @param tGasBottleInfo 气瓶信息
+     * @return 结果
+     */
+    public int updateTGasBottleInfo(TGasBottleInfo tGasBottleInfo);
+
+    /**
+     * 删除气瓶信息
+     * 
+     * @param bottleId 气瓶信息ID
+     * @return 结果
+     */
+    public int deleteTGasBottleInfoById(Long bottleId);
+
+    /**
+     * 批量删除气瓶信息
+     * 
+     * @param bottleIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTGasBottleInfoByIds(Long[] bottleIds);
+
+    /**
+     * 气瓶统计
+     * @param stationId 储配站id
+     * @return
+     */
+    List<BottleStatistics> bottleStatistics(Long stationId);
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TGasBottleTrackRecord;
+
+/**
+ * 气瓶追溯Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-08-18
+ */
+public interface TGasBottleTrackRecordMapper 
+{
+    /**
+     * 查询气瓶追溯
+     * 
+     * @param trackRecordId 气瓶追溯ID
+     * @return 气瓶追溯
+     */
+    public TGasBottleTrackRecord selectTGasBottleTrackRecordById(Long trackRecordId);
+
+    /**
+     * 查询气瓶追溯列表
+     * 
+     * @param tGasBottleTrackRecord 气瓶追溯
+     * @return 气瓶追溯集合
+     */
+    public List<TGasBottleTrackRecord> selectTGasBottleTrackRecordList(TGasBottleTrackRecord tGasBottleTrackRecord);
+
+    /**
+     * 新增气瓶追溯
+     * 
+     * @param tGasBottleTrackRecord 气瓶追溯
+     * @return 结果
+     */
+    public int insertTGasBottleTrackRecord(TGasBottleTrackRecord tGasBottleTrackRecord);
+
+    /**
+     * 修改气瓶追溯
+     * 
+     * @param tGasBottleTrackRecord 气瓶追溯
+     * @return 结果
+     */
+    public int updateTGasBottleTrackRecord(TGasBottleTrackRecord tGasBottleTrackRecord);
+
+    /**
+     * 删除气瓶追溯
+     * 
+     * @param trackRecordId 气瓶追溯ID
+     * @return 结果
+     */
+    public int deleteTGasBottleTrackRecordById(Long trackRecordId);
+
+    /**
+     * 批量删除气瓶追溯
+     * 
+     * @param trackRecordIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTGasBottleTrackRecordByIds(Long[] trackRecordIds);
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+
+import com.zehong.system.domain.BaseInfoStatistics;
+import com.zehong.system.domain.TGasStorageStationInfo;
+
+/**
+ * 储配站信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-08-14
+ */
+public interface TGasStorageStationInfoMapper 
+{
+    /**
+     * 查询储配站信息
+     * 
+     * @param stationId 储配站信息ID
+     * @return 储配站信息
+     */
+    public TGasStorageStationInfo selectTGasStorageStationInfoById(Long stationId);
+
+    /**
+     * 查询储配站信息列表
+     * 
+     * @param tGasStorageStationInfo 储配站信息
+     * @return 储配站信息集合
+     */
+    public List<TGasStorageStationInfo> selectTGasStorageStationInfoList(TGasStorageStationInfo tGasStorageStationInfo);
+
+    /**
+     * 新增储配站信息
+     * 
+     * @param tGasStorageStationInfo 储配站信息
+     * @return 结果
+     */
+    public int insertTGasStorageStationInfo(TGasStorageStationInfo tGasStorageStationInfo);
+
+    /**
+     * 修改储配站信息
+     * 
+     * @param tGasStorageStationInfo 储配站信息
+     * @return 结果
+     */
+    public int updateTGasStorageStationInfo(TGasStorageStationInfo tGasStorageStationInfo);
+
+    /**
+     * 删除储配站信息
+     * 
+     * @param stationId 储配站信息ID
+     * @return 结果
+     */
+    public int deleteTGasStorageStationInfoById(Long stationId);
+
+    /**
+     * 批量删除储配站信息
+     * 
+     * @param stationIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTGasStorageStationInfoByIds(Long[] stationIds);
+
+    /**
+     * 基础信息统计
+     * @param stationId 储配站id
+     * @return
+     */
+    List<BaseInfoStatistics> baseInfoStatistics(Long stationId);
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TGasUserInfo;
+
+/**
+ * 燃气用户Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-08-17
+ */
+public interface TGasUserInfoMapper 
+{
+    /**
+     * 查询燃气用户
+     * 
+     * @param gasUserId 燃气用户ID
+     * @return 燃气用户
+     */
+    public TGasUserInfo selectTGasUserInfoById(Long gasUserId);
+
+    /**
+     * 查询燃气用户列表
+     * 
+     * @param tGasUserInfo 燃气用户
+     * @return 燃气用户集合
+     */
+    public List<TGasUserInfo> selectTGasUserInfoList(TGasUserInfo tGasUserInfo);
+
+    /**
+     * 新增燃气用户
+     * 
+     * @param tGasUserInfo 燃气用户
+     * @return 结果
+     */
+    public int insertTGasUserInfo(TGasUserInfo tGasUserInfo);
+
+    /**
+     * 修改燃气用户
+     * 
+     * @param tGasUserInfo 燃气用户
+     * @return 结果
+     */
+    public int updateTGasUserInfo(TGasUserInfo tGasUserInfo);
+
+    /**
+     * 删除燃气用户
+     * 
+     * @param gasUserId 燃气用户ID
+     * @return 结果
+     */
+    public int deleteTGasUserInfoById(Long gasUserId);
+
+    /**
+     * 批量删除燃气用户
+     * 
+     * @param gasUserIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTGasUserInfoByIds(Long[] gasUserIds);
+}

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

 package com.zehong.system.mapper;
 
 import java.util.List;
+
+import com.zehong.system.domain.Statistics;
 import com.zehong.system.domain.THiddenDangerStandingBook;
 import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
 import com.zehong.system.domain.vo.THiddenDangerStandingBookVo;
@@ -67,4 +69,11 @@ public interface THiddenDangerStandingBookMapper
      * @return 结果
      */
     public int deleteTHiddenDangerStandingBookByIds(Long[] hiddenIds);
+
+    /**
+     * 获取隐患整治台账统计信息
+     * @param sevenDate
+     * @return
+     */
+    List<Statistics> hazardStatistics(List<String> sevenDate);
 }

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TPractitionerInfo;
+
+/**
+ * 从业人员信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-08-16
+ */
+public interface TPractitionerInfoMapper 
+{
+    /**
+     * 查询从业人员信息
+     * 
+     * @param practitionerId 从业人员信息ID
+     * @return 从业人员信息
+     */
+    public TPractitionerInfo selectTPractitionerInfoById(Long practitionerId);
+
+    /**
+     * 查询从业人员信息列表
+     * 
+     * @param tPractitionerInfo 从业人员信息
+     * @return 从业人员信息集合
+     */
+    public List<TPractitionerInfo> selectTPractitionerInfoList(TPractitionerInfo tPractitionerInfo);
+
+    /**
+     * 新增从业人员信息
+     * 
+     * @param tPractitionerInfo 从业人员信息
+     * @return 结果
+     */
+    public int insertTPractitionerInfo(TPractitionerInfo tPractitionerInfo);
+
+    /**
+     * 修改从业人员信息
+     * 
+     * @param tPractitionerInfo 从业人员信息
+     * @return 结果
+     */
+    public int updateTPractitionerInfo(TPractitionerInfo tPractitionerInfo);
+
+    /**
+     * 删除从业人员信息
+     * 
+     * @param practitionerId 从业人员信息ID
+     * @return 结果
+     */
+    public int deleteTPractitionerInfoById(Long practitionerId);
+
+    /**
+     * 批量删除从业人员信息
+     * 
+     * @param practitionerIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTPractitionerInfoByIds(Long[] practitionerIds);
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TSafeCheckRecord;
+
+/**
+ * 安检记录Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-08-21
+ */
+public interface TSafeCheckRecordMapper 
+{
+    /**
+     * 查询安检记录
+     * 
+     * @param safeCheckId 安检记录ID
+     * @return 安检记录
+     */
+    public TSafeCheckRecord selectTSafeCheckRecordById(Long safeCheckId);
+
+    /**
+     * 查询安检记录列表
+     * 
+     * @param tSafeCheckRecord 安检记录
+     * @return 安检记录集合
+     */
+    public List<TSafeCheckRecord> selectTSafeCheckRecordList(TSafeCheckRecord tSafeCheckRecord);
+
+    /**
+     * 新增安检记录
+     * 
+     * @param tSafeCheckRecord 安检记录
+     * @return 结果
+     */
+    public int insertTSafeCheckRecord(TSafeCheckRecord tSafeCheckRecord);
+
+    /**
+     * 修改安检记录
+     * 
+     * @param tSafeCheckRecord 安检记录
+     * @return 结果
+     */
+    public int updateTSafeCheckRecord(TSafeCheckRecord tSafeCheckRecord);
+
+    /**
+     * 删除安检记录
+     * 
+     * @param safeCheckId 安检记录ID
+     * @return 结果
+     */
+    public int deleteTSafeCheckRecordById(Long safeCheckId);
+
+    /**
+     * 批量删除安检记录
+     * 
+     * @param safeCheckIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTSafeCheckRecordByIds(Long[] safeCheckIds);
+}

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

 package com.zehong.system.mapper;
 
 import java.util.List;
+
+import com.zehong.system.domain.Statistics;
 import com.zehong.system.domain.TTroubleStandingBook;
 import com.zehong.system.domain.form.TTroubleStandingBookForm;
 import com.zehong.system.domain.vo.TTroubleStandingBookVo;
@@ -67,4 +69,11 @@ public interface TTroubleStandingBookMapper
      * @return 结果
      */
     public int deleteTTroubleStandingBookByIds(Long[] troubleIds);
+
+    /**
+     * 查询统计信息
+     * @param sevenDate
+     * @return
+     */
+    List<Statistics> accidentLedger(List<String> sevenDate);
 }

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TVehicleUseRecord;
+
+/**
+ * 车辆使用记录Mapper接口
+ * 
+ * @author zehong
+ * @date 2023-08-19
+ */
+public interface TVehicleUseRecordMapper 
+{
+    /**
+     * 查询车辆使用记录
+     * 
+     * @param vehicleUseRecordId 车辆使用记录ID
+     * @return 车辆使用记录
+     */
+    public TVehicleUseRecord selectTVehicleUseRecordById(Long vehicleUseRecordId);
+
+    /**
+     * 查询车辆使用记录列表
+     * 
+     * @param tVehicleUseRecord 车辆使用记录
+     * @return 车辆使用记录集合
+     */
+    public List<TVehicleUseRecord> selectTVehicleUseRecordList(TVehicleUseRecord tVehicleUseRecord);
+
+    /**
+     * 新增车辆使用记录
+     * 
+     * @param tVehicleUseRecord 车辆使用记录
+     * @return 结果
+     */
+    public int insertTVehicleUseRecord(TVehicleUseRecord tVehicleUseRecord);
+
+    /**
+     * 修改车辆使用记录
+     * 
+     * @param tVehicleUseRecord 车辆使用记录
+     * @return 结果
+     */
+    public int updateTVehicleUseRecord(TVehicleUseRecord tVehicleUseRecord);
+
+    /**
+     * 删除车辆使用记录
+     * 
+     * @param vehicleUseRecordId 车辆使用记录ID
+     * @return 结果
+     */
+    public int deleteTVehicleUseRecordById(Long vehicleUseRecordId);
+
+    /**
+     * 批量删除车辆使用记录
+     * 
+     * @param vehicleUseRecordIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTVehicleUseRecordByIds(Long[] vehicleUseRecordIds);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+
+import com.zehong.system.domain.AirChargeOperatorStatistics;
+import com.zehong.system.domain.AirChargeStationStatistics;
+import com.zehong.system.domain.TAirChargeRecord;
+import com.zehong.system.domain.vo.AirChargeStatisticsVo;
+
+/**
+ * 充装记录Service接口
+ * 
+ * @author zehong
+ * @date 2023-08-21
+ */
+public interface ITAirChargeRecordService 
+{
+    /**
+     * 查询充装记录
+     * 
+     * @param chargeRecordId 充装记录ID
+     * @return 充装记录
+     */
+    public TAirChargeRecord selectTAirChargeRecordById(Long chargeRecordId);
+
+    /**
+     * 查询充装记录列表
+     * 
+     * @param tAirChargeRecord 充装记录
+     * @return 充装记录集合
+     */
+    public List<TAirChargeRecord> selectTAirChargeRecordList(TAirChargeRecord tAirChargeRecord);
+
+    /**
+     * 新增充装记录
+     * 
+     * @param tAirChargeRecord 充装记录
+     * @return 结果
+     */
+    public int insertTAirChargeRecord(TAirChargeRecord tAirChargeRecord);
+
+    /**
+     * 修改充装记录
+     * 
+     * @param tAirChargeRecord 充装记录
+     * @return 结果
+     */
+    public int updateTAirChargeRecord(TAirChargeRecord tAirChargeRecord);
+
+    /**
+     * 批量删除充装记录
+     * 
+     * @param chargeRecordIds 需要删除的充装记录ID
+     * @return 结果
+     */
+    public int deleteTAirChargeRecordByIds(Long[] chargeRecordIds);
+
+    /**
+     * 删除充装记录信息
+     * 
+     * @param chargeRecordId 充装记录ID
+     * @return 结果
+     */
+    public int deleteTAirChargeRecordById(Long chargeRecordId);
+
+    /**
+     * 充装记录导入
+     * @param airChargeRecordList 充装记录实体
+     * @param isUpdateSupport 是否更新
+     * @return
+     */
+    String importAirChargeRecordInfo(List<TAirChargeRecord> airChargeRecordList, boolean isUpdateSupport);
+
+    /**
+     * 储配站充装统计
+     * @param airChargeStatisticsVo 统计实体
+     * @return
+     */
+    List<AirChargeStationStatistics> airChargeStationStatistics(AirChargeStatisticsVo airChargeStatisticsVo);
+
+    /**
+     * 充装人员统计
+     * @param airChargeStatisticsVo 统计
+     * @return
+     */
+    List<AirChargeOperatorStatistics> airChargeOperatorStatistics(AirChargeStatisticsVo airChargeStatisticsVo);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TDeliveryRecord;
+
+/**
+ * 配送记录Service接口
+ * 
+ * @author zehong
+ * @date 2023-08-22
+ */
+public interface ITDeliveryRecordService 
+{
+    /**
+     * 查询配送记录
+     * 
+     * @param deliveryRecordId 配送记录ID
+     * @return 配送记录
+     */
+    public TDeliveryRecord selectTDeliveryRecordById(Long deliveryRecordId);
+
+    /**
+     * 查询配送记录列表
+     * 
+     * @param tDeliveryRecord 配送记录
+     * @return 配送记录集合
+     */
+    public List<TDeliveryRecord> selectTDeliveryRecordList(TDeliveryRecord tDeliveryRecord);
+
+    /**
+     * 新增配送记录
+     * 
+     * @param tDeliveryRecord 配送记录
+     * @return 结果
+     */
+    public int insertTDeliveryRecord(TDeliveryRecord tDeliveryRecord);
+
+    /**
+     * 修改配送记录
+     * 
+     * @param tDeliveryRecord 配送记录
+     * @return 结果
+     */
+    public int updateTDeliveryRecord(TDeliveryRecord tDeliveryRecord);
+
+    /**
+     * 批量删除配送记录
+     * 
+     * @param deliveryRecordIds 需要删除的配送记录ID
+     * @return 结果
+     */
+    public int deleteTDeliveryRecordByIds(Long[] deliveryRecordIds);
+
+    /**
+     * 删除配送记录信息
+     * 
+     * @param deliveryRecordId 配送记录ID
+     * @return 结果
+     */
+    public int deleteTDeliveryRecordById(Long deliveryRecordId);
+}

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.zehong.system.domain.TDetectorUser;
+import com.zehong.system.domain.TDetectorUserCount;
 import com.zehong.system.domain.vo.TDetectorUserVO;
 
 /**
@@ -98,4 +99,11 @@ public interface ITDetectorUserService
      * @return
      */
     public Map<String,Object> selectUserNum();
+
+
+    /**
+     * 查询用户统计信息
+     * @return
+     */
+    TDetectorUserCount userStatistics();
 }

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

@@ -61,4 +61,6 @@ public interface ITEnterpriseInfoService
      * @return 结果
      */
     public int deleteTEnterpriseInfoById(Long enterpriseId);
+
+
 }

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

+package com.zehong.system.service;
+
+import com.zehong.system.domain.BottleStatistics;
+import com.zehong.system.domain.TGasBottleInfo;
+
+import java.util.List;
+
+/**
+ * 气瓶信息Service接口
+ * 
+ * @author zehong
+ * @date 2023-08-15
+ */
+public interface ITGasBottleInfoService 
+{
+    /**
+     * 查询气瓶信息
+     * 
+     * @param bottleId 气瓶信息ID
+     * @return 气瓶信息
+     */
+    public TGasBottleInfo selectTGasBottleInfoById(Long bottleId);
+
+    /**
+     * 查询气瓶信息列表
+     * 
+     * @param tGasBottleInfo 气瓶信息
+     * @return 气瓶信息集合
+     */
+    public List<TGasBottleInfo> selectTGasBottleInfoList(TGasBottleInfo tGasBottleInfo);
+
+    /**
+     * 新增气瓶信息
+     * 
+     * @param tGasBottleInfo 气瓶信息
+     * @return 结果
+     */
+    public int insertTGasBottleInfo(TGasBottleInfo tGasBottleInfo);
+
+    /**
+     * 修改气瓶信息
+     * 
+     * @param tGasBottleInfo 气瓶信息
+     * @return 结果
+     */
+    public int updateTGasBottleInfo(TGasBottleInfo tGasBottleInfo);
+
+    /**
+     * 批量删除气瓶信息
+     * 
+     * @param bottleIds 需要删除的气瓶信息ID
+     * @return 结果
+     */
+    public int deleteTGasBottleInfoByIds(Long[] bottleIds);
+
+    /**
+     * 删除气瓶信息信息
+     * 
+     * @param bottleId 气瓶信息ID
+     * @return 结果
+     */
+    public int deleteTGasBottleInfoById(Long bottleId);
+
+    /**
+     * 气瓶数据导出
+     * @param tGasBottleInfoList 气瓶实体
+     * @param isUpdateSupport 是否更新
+     * @return
+     */
+    String importTGasBottleInfo(List<TGasBottleInfo> tGasBottleInfoList,Boolean isUpdateSupport);
+
+    /**
+     * 气瓶统计
+     * @param stationId 储配站id
+     * @return
+     */
+    List<BottleStatistics> bottleStatistics(Long stationId);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TGasBottleTrackRecord;
+
+/**
+ * 气瓶追溯Service接口
+ * 
+ * @author zehong
+ * @date 2023-08-18
+ */
+public interface ITGasBottleTrackRecordService 
+{
+    /**
+     * 查询气瓶追溯
+     * 
+     * @param trackRecordId 气瓶追溯ID
+     * @return 气瓶追溯
+     */
+    public TGasBottleTrackRecord selectTGasBottleTrackRecordById(Long trackRecordId);
+
+    /**
+     * 查询气瓶追溯列表
+     * 
+     * @param tGasBottleTrackRecord 气瓶追溯
+     * @return 气瓶追溯集合
+     */
+    public List<TGasBottleTrackRecord> selectTGasBottleTrackRecordList(TGasBottleTrackRecord tGasBottleTrackRecord);
+
+    /**
+     * 新增气瓶追溯
+     * 
+     * @param tGasBottleTrackRecord 气瓶追溯
+     * @return 结果
+     */
+    public int insertTGasBottleTrackRecord(TGasBottleTrackRecord tGasBottleTrackRecord);
+
+    /**
+     * 修改气瓶追溯
+     * 
+     * @param tGasBottleTrackRecord 气瓶追溯
+     * @return 结果
+     */
+    public int updateTGasBottleTrackRecord(TGasBottleTrackRecord tGasBottleTrackRecord);
+
+    /**
+     * 批量删除气瓶追溯
+     * 
+     * @param trackRecordIds 需要删除的气瓶追溯ID
+     * @return 结果
+     */
+    public int deleteTGasBottleTrackRecordByIds(Long[] trackRecordIds);
+
+    /**
+     * 删除气瓶追溯信息
+     * 
+     * @param trackRecordId 气瓶追溯ID
+     * @return 结果
+     */
+    public int deleteTGasBottleTrackRecordById(Long trackRecordId);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+
+import com.zehong.system.domain.BaseInfoStatistics;
+import com.zehong.system.domain.TGasStorageStationInfo;
+
+/**
+ * 储配站信息Service接口
+ * 
+ * @author zehong
+ * @date 2023-08-14
+ */
+public interface ITGasStorageStationInfoService 
+{
+    /**
+     * 查询储配站信息
+     * 
+     * @param stationId 储配站信息ID
+     * @return 储配站信息
+     */
+    public TGasStorageStationInfo selectTGasStorageStationInfoById(Long stationId);
+
+    /**
+     * 查询储配站信息列表
+     * 
+     * @param tGasStorageStationInfo 储配站信息
+     * @return 储配站信息集合
+     */
+    public List<TGasStorageStationInfo> selectTGasStorageStationInfoList(TGasStorageStationInfo tGasStorageStationInfo);
+
+    /**
+     * 新增储配站信息
+     * 
+     * @param tGasStorageStationInfo 储配站信息
+     * @return 结果
+     */
+    public int insertTGasStorageStationInfo(TGasStorageStationInfo tGasStorageStationInfo);
+
+    /**
+     * 修改储配站信息
+     * 
+     * @param tGasStorageStationInfo 储配站信息
+     * @return 结果
+     */
+    public int updateTGasStorageStationInfo(TGasStorageStationInfo tGasStorageStationInfo);
+
+    /**
+     * 批量删除储配站信息
+     * 
+     * @param stationIds 需要删除的储配站信息ID
+     * @return 结果
+     */
+    public int deleteTGasStorageStationInfoByIds(Long[] stationIds);
+
+    /**
+     * 删除储配站信息信息
+     * 
+     * @param stationId 储配站信息ID
+     * @return 结果
+     */
+    public int deleteTGasStorageStationInfoById(Long stationId);
+
+    /**
+     * 导入数据
+     *
+     * @param tGasStorageStationInfoList 数据列表
+     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
+     * @return 结果
+     */
+    String importTGasStorageStationInfo(List<TGasStorageStationInfo> tGasStorageStationInfoList, Boolean isUpdateSupport);
+
+    /**
+     * 基础信息统计
+     * @param stationId 储配站id
+     * @return
+     */
+    List<BaseInfoStatistics> baseInfoStatistics(Long stationId);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TGasUserInfo;
+
+/**
+ * 燃气用户Service接口
+ * 
+ * @author zehong
+ * @date 2023-08-17
+ */
+public interface ITGasUserInfoService 
+{
+    /**
+     * 查询燃气用户
+     * 
+     * @param gasUserId 燃气用户ID
+     * @return 燃气用户
+     */
+    public TGasUserInfo selectTGasUserInfoById(Long gasUserId);
+
+    /**
+     * 查询燃气用户列表
+     * 
+     * @param tGasUserInfo 燃气用户
+     * @return 燃气用户集合
+     */
+    public List<TGasUserInfo> selectTGasUserInfoList(TGasUserInfo tGasUserInfo);
+
+    /**
+     * 新增燃气用户
+     * 
+     * @param tGasUserInfo 燃气用户
+     * @return 结果
+     */
+    public int insertTGasUserInfo(TGasUserInfo tGasUserInfo);
+
+    /**
+     * 修改燃气用户
+     * 
+     * @param tGasUserInfo 燃气用户
+     * @return 结果
+     */
+    public int updateTGasUserInfo(TGasUserInfo tGasUserInfo);
+
+    /**
+     * 批量删除燃气用户
+     * 
+     * @param gasUserIds 需要删除的燃气用户ID
+     * @return 结果
+     */
+    public int deleteTGasUserInfoByIds(Long[] gasUserIds);
+
+    /**
+     * 删除燃气用户信息
+     * 
+     * @param gasUserId 燃气用户ID
+     * @return 结果
+     */
+    public int deleteTGasUserInfoById(Long gasUserId);
+
+    /**
+     * 燃气用户导入
+     * @param tGasUserInfoList 燃气用户实体
+     * @param isUpdateSupport 是否更新
+     * @return
+     */
+    String importTGasUserInfo(List<TGasUserInfo> tGasUserInfoList, boolean isUpdateSupport);
+}

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

 package com.zehong.system.service;
 
 import java.util.List;
+
+import com.zehong.system.domain.Statistics;
 import com.zehong.system.domain.THiddenDangerStandingBook;
 import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
 import com.zehong.system.domain.vo.THiddenDangerStandingBookVo;
@@ -67,4 +69,10 @@ public interface ITHiddenDangerStandingBookService
      * @return 结果
      */
     public int deleteTHiddenDangerStandingBookById(Long hiddenId);
+
+    /**
+     * 获取隐患整治台账统计信息
+     * @param sevenDate
+     */
+    List<Statistics> hazardStatistics(List<String> sevenDate);
 }

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

+package com.zehong.system.service;
+
+import java.util.List;
+
+import com.zehong.system.domain.TGasBottleInfo;
+import com.zehong.system.domain.TPractitionerInfo;
+
+/**
+ * 从业人员信息Service接口
+ * 
+ * @author zehong
+ * @date 2023-08-16
+ */
+public interface ITPractitionerInfoService 
+{
+    /**
+     * 查询从业人员信息
+     * 
+     * @param practitionerId 从业人员信息ID
+     * @return 从业人员信息
+     */
+    public TPractitionerInfo selectTPractitionerInfoById(Long practitionerId);
+
+    /**
+     * 查询从业人员信息列表
+     * 
+     * @param tPractitionerInfo 从业人员信息
+     * @return 从业人员信息集合
+     */
+    public List<TPractitionerInfo> selectTPractitionerInfoList(TPractitionerInfo tPractitionerInfo);
+
+    /**
+     * 新增从业人员信息
+     * 
+     * @param tPractitionerInfo 从业人员信息
+     * @return 结果
+     */
+    public int insertTPractitionerInfo(TPractitionerInfo tPractitionerInfo);
+
+    /**
+     * 修改从业人员信息
+     * 
+     * @param tPractitionerInfo 从业人员信息
+     * @return 结果
+     */
+    public int updateTPractitionerInfo(TPractitionerInfo tPractitionerInfo);
+
+    /**
+     * 批量删除从业人员信息
+     * 
+     * @param practitionerIds 需要删除的从业人员信息ID
+     * @return 结果
+     */
+    public int deleteTPractitionerInfoByIds(Long[] practitionerIds);
+
+    /**
+     * 删除从业人员信息信息
+     * 
+     * @param practitionerId 从业人员信息ID
+     * @return 结果
+     */
+    public int deleteTPractitionerInfoById(Long practitionerId);
+
+    /**
+     * 从业人员数据导入
+     * @param tPractitionerInfoList 从业人员实体
+     * @param isUpdateSupport 是否更新
+     * @return
+     */
+    String importTPractitionerInfo(List<TPractitionerInfo> tPractitionerInfoList, Boolean isUpdateSupport);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TSafeCheckRecord;
+
+/**
+ * 安检记录Service接口
+ * 
+ * @author zehong
+ * @date 2023-08-21
+ */
+public interface ITSafeCheckRecordService 
+{
+    /**
+     * 查询安检记录
+     * 
+     * @param safeCheckId 安检记录ID
+     * @return 安检记录
+     */
+    public TSafeCheckRecord selectTSafeCheckRecordById(Long safeCheckId);
+
+    /**
+     * 查询安检记录列表
+     * 
+     * @param tSafeCheckRecord 安检记录
+     * @return 安检记录集合
+     */
+    public List<TSafeCheckRecord> selectTSafeCheckRecordList(TSafeCheckRecord tSafeCheckRecord);
+
+    /**
+     * 新增安检记录
+     * 
+     * @param tSafeCheckRecord 安检记录
+     * @return 结果
+     */
+    public int insertTSafeCheckRecord(TSafeCheckRecord tSafeCheckRecord);
+
+    /**
+     * 修改安检记录
+     * 
+     * @param tSafeCheckRecord 安检记录
+     * @return 结果
+     */
+    public int updateTSafeCheckRecord(TSafeCheckRecord tSafeCheckRecord);
+
+    /**
+     * 批量删除安检记录
+     * 
+     * @param safeCheckIds 需要删除的安检记录ID
+     * @return 结果
+     */
+    public int deleteTSafeCheckRecordByIds(Long[] safeCheckIds);
+
+    /**
+     * 删除安检记录信息
+     * 
+     * @param safeCheckId 安检记录ID
+     * @return 结果
+     */
+    public int deleteTSafeCheckRecordById(Long safeCheckId);
+}

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

 package com.zehong.system.service;
 
 import java.util.List;
+
+import com.zehong.system.domain.Statistics;
 import com.zehong.system.domain.TTroubleStandingBook;
 import com.zehong.system.domain.form.TTroubleStandingBookForm;
 import com.zehong.system.domain.vo.TTroubleStandingBookVo;
@@ -67,4 +69,14 @@ public interface ITTroubleStandingBookService
      * @return 结果
      */
     public int deleteTTroubleStandingBookById(Long troubleId);
+
+
+    /**
+     * 查询统计信息
+     * @return
+     */
+    List<Statistics> accidentLedger(List<String> sevenDate);
+
+
+
 }

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

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TVehicleUseRecord;
+
+/**
+ * 车辆使用记录Service接口
+ * 
+ * @author zehong
+ * @date 2023-08-19
+ */
+public interface ITVehicleUseRecordService 
+{
+    /**
+     * 查询车辆使用记录
+     * 
+     * @param vehicleUseRecordId 车辆使用记录ID
+     * @return 车辆使用记录
+     */
+    public TVehicleUseRecord selectTVehicleUseRecordById(Long vehicleUseRecordId);
+
+    /**
+     * 查询车辆使用记录列表
+     * 
+     * @param tVehicleUseRecord 车辆使用记录
+     * @return 车辆使用记录集合
+     */
+    public List<TVehicleUseRecord> selectTVehicleUseRecordList(TVehicleUseRecord tVehicleUseRecord);
+
+    /**
+     * 新增车辆使用记录
+     * 
+     * @param tVehicleUseRecord 车辆使用记录
+     * @return 结果
+     */
+    public int insertTVehicleUseRecord(TVehicleUseRecord tVehicleUseRecord);
+
+    /**
+     * 修改车辆使用记录
+     * 
+     * @param tVehicleUseRecord 车辆使用记录
+     * @return 结果
+     */
+    public int updateTVehicleUseRecord(TVehicleUseRecord tVehicleUseRecord);
+
+    /**
+     * 批量删除车辆使用记录
+     * 
+     * @param vehicleUseRecordIds 需要删除的车辆使用记录ID
+     * @return 结果
+     */
+    public int deleteTVehicleUseRecordByIds(Long[] vehicleUseRecordIds);
+
+    /**
+     * 删除车辆使用记录信息
+     * 
+     * @param vehicleUseRecordId 车辆使用记录ID
+     * @return 结果
+     */
+    public int deleteTVehicleUseRecordById(Long vehicleUseRecordId);
+}

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

+package com.zehong.system.service.impl;
+
+import com.zehong.common.exception.CustomException;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.StringUtils;
+import com.zehong.system.domain.*;
+import com.zehong.system.domain.vo.AirChargeStatisticsVo;
+import com.zehong.system.mapper.TAirChargeRecordMapper;
+import com.zehong.system.mapper.TGasBottleInfoMapper;
+import com.zehong.system.mapper.TGasStorageStationInfoMapper;
+import com.zehong.system.mapper.TPractitionerInfoMapper;
+import com.zehong.system.service.ITAirChargeRecordService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 充装记录Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-08-21
+ */
+@Service
+public class TAirChargeRecordServiceImpl implements ITAirChargeRecordService 
+{
+    private static final Logger log = LoggerFactory.getLogger(TAirChargeRecordServiceImpl.class);
+
+    @Autowired
+    private TAirChargeRecordMapper tAirChargeRecordMapper;
+
+    @Resource
+    private TGasStorageStationInfoMapper tGasStorageStationInfoMapper;
+
+    @Resource
+    private TGasBottleInfoMapper tGasBottleInfoMapper;
+
+    @Resource
+    private TPractitionerInfoMapper tPractitionerInfoMapper;
+
+    /**
+     * 查询充装记录
+     * 
+     * @param chargeRecordId 充装记录ID
+     * @return 充装记录
+     */
+    @Override
+    public TAirChargeRecord selectTAirChargeRecordById(Long chargeRecordId)
+    {
+        return tAirChargeRecordMapper.selectTAirChargeRecordById(chargeRecordId);
+    }
+
+    /**
+     * 查询充装记录列表
+     * 
+     * @param tAirChargeRecord 充装记录
+     * @return 充装记录
+     */
+    @Override
+    public List<TAirChargeRecord> selectTAirChargeRecordList(TAirChargeRecord tAirChargeRecord)
+    {
+        return tAirChargeRecordMapper.selectTAirChargeRecordList(tAirChargeRecord);
+    }
+
+    /**
+     * 新增充装记录
+     * 
+     * @param tAirChargeRecord 充装记录
+     * @return 结果
+     */
+    @Override
+    public int insertTAirChargeRecord(TAirChargeRecord tAirChargeRecord)
+    {
+        tAirChargeRecord.setCreateTime(DateUtils.getNowDate());
+        return tAirChargeRecordMapper.insertTAirChargeRecord(tAirChargeRecord);
+    }
+
+    /**
+     * 修改充装记录
+     * 
+     * @param tAirChargeRecord 充装记录
+     * @return 结果
+     */
+    @Override
+    public int updateTAirChargeRecord(TAirChargeRecord tAirChargeRecord)
+    {
+        tAirChargeRecord.setUpdateTime(DateUtils.getNowDate());
+        return tAirChargeRecordMapper.updateTAirChargeRecord(tAirChargeRecord);
+    }
+
+    /**
+     * 批量删除充装记录
+     * 
+     * @param chargeRecordIds 需要删除的充装记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTAirChargeRecordByIds(Long[] chargeRecordIds)
+    {
+        return tAirChargeRecordMapper.deleteTAirChargeRecordByIds(chargeRecordIds);
+    }
+
+    /**
+     * 删除充装记录信息
+     * 
+     * @param chargeRecordId 充装记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTAirChargeRecordById(Long chargeRecordId)
+    {
+        return tAirChargeRecordMapper.deleteTAirChargeRecordById(chargeRecordId);
+    }
+
+    /**
+     * 充装记录导入
+     * @param airChargeRecordList 充装记录实体
+     * @param isUpdateSupport 是否更新
+     * @return
+     */
+    @Override
+    public String importAirChargeRecordInfo(List<TAirChargeRecord> airChargeRecordList, boolean isUpdateSupport){
+        if (StringUtils.isNull(airChargeRecordList) || airChargeRecordList.size() == 0){
+            throw new CustomException("导入数据不能为空！");
+        }
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (TAirChargeRecord tAirChargeRecord : airChargeRecordList){
+            try {
+                //查询储配站信息
+                TGasStorageStationInfo queryGasStorageStationInfo = new TGasStorageStationInfo();
+                queryGasStorageStationInfo.setStationName(tAirChargeRecord.getStationName());
+                //储配站
+                List<TGasStorageStationInfo> gasStorageStationInfo = tGasStorageStationInfoMapper.selectTGasStorageStationInfoList(queryGasStorageStationInfo);
+                if(CollectionUtils.isEmpty(gasStorageStationInfo)){
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、气瓶条码 " + tAirChargeRecord.getBottleCode() +"、储配站" + tAirChargeRecord.getStationName() + " 不存在请创建或导入");
+                    continue;
+                }
+
+                //气瓶
+                TGasBottleInfo tGasBottleInfo = new TGasBottleInfo();
+                tGasBottleInfo.setBottleCode(tAirChargeRecord.getBottleCode());
+                List<TGasBottleInfo> gasBottleInfoList = tGasBottleInfoMapper.selectTGasBottleInfoList(tGasBottleInfo);
+                if(CollectionUtils.isEmpty(gasBottleInfoList)){
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、气瓶条码 " + tAirChargeRecord.getBottleCode() + " 不存在请创建");
+                    continue;
+                }
+                //从业人员
+                TPractitionerInfo query = new TPractitionerInfo();
+                query.setName(tAirChargeRecord.getChargeOperatorName());
+                List<TPractitionerInfo> queryPractitionerInfo = tPractitionerInfoMapper.selectTPractitionerInfoList(query);
+                if(CollectionUtils.isEmpty(queryPractitionerInfo)){
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、从业人员 " + tAirChargeRecord.getChargeOperatorName() + " 不存在请创建");
+                    continue;
+                }
+
+                tAirChargeRecord.setStationId(gasStorageStationInfo.get(0).getStationId());
+                tAirChargeRecord.setBottleId(gasBottleInfoList.get(0).getBottleId());
+                tAirChargeRecord.setChargeOperator(queryPractitionerInfo.get(0).getPractitionerId());
+                this.insertTAirChargeRecord(tAirChargeRecord);
+                successNum++;
+                successMsg.append("<br/>" + successNum + "、气瓶条码为 " + tAirChargeRecord.getBottleCode() + " 充装记录导入成功");
+            }
+            catch (Exception e)
+            {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、气瓶条码为 " + tAirChargeRecord.getBottleCode() + " 充装记录导入失败：";
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+        }
+        if (failureNum > 0)
+        {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new CustomException(failureMsg.toString());
+        }
+        else
+        {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
+    /**
+     * 储配站充装统计
+     * @param airChargeStatisticsVo 统计实体
+     * @return
+     */
+    @Override
+    public List<AirChargeStationStatistics> airChargeStationStatistics(AirChargeStatisticsVo airChargeStatisticsVo){
+        return tAirChargeRecordMapper.airChargeStationStatistics(airChargeStatisticsVo);
+    }
+
+    /**
+     * 充装人员统计
+     * @param airChargeStatisticsVo 统计
+     * @return
+     */
+    @Override
+    public List<AirChargeOperatorStatistics> airChargeOperatorStatistics(AirChargeStatisticsVo airChargeStatisticsVo){
+        return tAirChargeRecordMapper.airChargeOperatorStatistics(airChargeStatisticsVo);
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TDeliveryRecordServiceImpl.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.TDeliveryRecordMapper;
+import com.zehong.system.domain.TDeliveryRecord;
+import com.zehong.system.service.ITDeliveryRecordService;
+
+/**
+ * 配送记录Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-08-22
+ */
+@Service
+public class TDeliveryRecordServiceImpl implements ITDeliveryRecordService 
+{
+    @Autowired
+    private TDeliveryRecordMapper tDeliveryRecordMapper;
+
+    /**
+     * 查询配送记录
+     * 
+     * @param deliveryRecordId 配送记录ID
+     * @return 配送记录
+     */
+    @Override
+    public TDeliveryRecord selectTDeliveryRecordById(Long deliveryRecordId)
+    {
+        return tDeliveryRecordMapper.selectTDeliveryRecordById(deliveryRecordId);
+    }
+
+    /**
+     * 查询配送记录列表
+     * 
+     * @param tDeliveryRecord 配送记录
+     * @return 配送记录
+     */
+    @Override
+    public List<TDeliveryRecord> selectTDeliveryRecordList(TDeliveryRecord tDeliveryRecord)
+    {
+        return tDeliveryRecordMapper.selectTDeliveryRecordList(tDeliveryRecord);
+    }
+
+    /**
+     * 新增配送记录
+     * 
+     * @param tDeliveryRecord 配送记录
+     * @return 结果
+     */
+    @Override
+    public int insertTDeliveryRecord(TDeliveryRecord tDeliveryRecord)
+    {
+        tDeliveryRecord.setCreateTime(DateUtils.getNowDate());
+        return tDeliveryRecordMapper.insertTDeliveryRecord(tDeliveryRecord);
+    }
+
+    /**
+     * 修改配送记录
+     * 
+     * @param tDeliveryRecord 配送记录
+     * @return 结果
+     */
+    @Override
+    public int updateTDeliveryRecord(TDeliveryRecord tDeliveryRecord)
+    {
+        tDeliveryRecord.setUpdateTime(DateUtils.getNowDate());
+        return tDeliveryRecordMapper.updateTDeliveryRecord(tDeliveryRecord);
+    }
+
+    /**
+     * 批量删除配送记录
+     * 
+     * @param deliveryRecordIds 需要删除的配送记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDeliveryRecordByIds(Long[] deliveryRecordIds)
+    {
+        return tDeliveryRecordMapper.deleteTDeliveryRecordByIds(deliveryRecordIds);
+    }
+
+    /**
+     * 删除配送记录信息
+     * 
+     * @param deliveryRecordId 配送记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTDeliveryRecordById(Long deliveryRecordId)
+    {
+        return tDeliveryRecordMapper.deleteTDeliveryRecordById(deliveryRecordId);
+    }
+}

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

@@ -5,6 +5,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.TDetectorUserCount;
 import com.zehong.system.domain.vo.TDetectorUserVO;
 import com.zehong.system.mapper.TDetectorInfoMapper;
 import com.zehong.system.mapper.TDeviceInfoMapper;
@@ -221,4 +222,13 @@ public class TDetectorUserServiceImpl implements ITDetectorUserService
     public Map<String,Object> selectUserNum(){
         return tDetectorUserMapper.selectUserNum();
     }
+
+    /**
+     * 查询用户统计信息
+     * @return
+     */
+    @Override
+    public TDetectorUserCount userStatistics() {
+        return tDetectorUserMapper.userStatistics();
+    }
 }

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

+package com.zehong.system.service.impl;
+
+import com.zehong.common.exception.CustomException;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.StringUtils;
+import com.zehong.system.domain.BottleStatistics;
+import com.zehong.system.domain.TGasBottleInfo;
+import com.zehong.system.domain.TGasStorageStationInfo;
+import com.zehong.system.mapper.TGasBottleInfoMapper;
+import com.zehong.system.mapper.TGasStorageStationInfoMapper;
+import com.zehong.system.service.ITGasBottleInfoService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 气瓶信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-08-15
+ */
+@Service
+public class TGasBottleInfoServiceImpl implements ITGasBottleInfoService 
+{
+    private static final Logger log = LoggerFactory.getLogger(TGasBottleInfoServiceImpl.class);
+
+    @Autowired
+    private TGasBottleInfoMapper tGasBottleInfoMapper;
+
+    @Resource
+    private TGasStorageStationInfoMapper tGasStorageStationInfoMapper;
+
+    /**
+     * 查询气瓶信息
+     * 
+     * @param bottleId 气瓶信息ID
+     * @return 气瓶信息
+     */
+    @Override
+    public TGasBottleInfo selectTGasBottleInfoById(Long bottleId)
+    {
+        return tGasBottleInfoMapper.selectTGasBottleInfoById(bottleId);
+    }
+
+    /**
+     * 查询气瓶信息列表
+     * 
+     * @param tGasBottleInfo 气瓶信息
+     * @return 气瓶信息
+     */
+    @Override
+    public List<TGasBottleInfo> selectTGasBottleInfoList(TGasBottleInfo tGasBottleInfo)
+    {
+        return tGasBottleInfoMapper.selectTGasBottleInfoList(tGasBottleInfo);
+    }
+
+    /**
+     * 新增气瓶信息
+     * 
+     * @param tGasBottleInfo 气瓶信息
+     * @return 结果
+     */
+    @Override
+    public int insertTGasBottleInfo(TGasBottleInfo tGasBottleInfo)
+    {
+        tGasBottleInfo.setCreateTime(DateUtils.getNowDate());
+        return tGasBottleInfoMapper.insertTGasBottleInfo(tGasBottleInfo);
+    }
+
+    /**
+     * 修改气瓶信息
+     * 
+     * @param tGasBottleInfo 气瓶信息
+     * @return 结果
+     */
+    @Override
+    public int updateTGasBottleInfo(TGasBottleInfo tGasBottleInfo)
+    {
+        tGasBottleInfo.setUpdateTime(DateUtils.getNowDate());
+        return tGasBottleInfoMapper.updateTGasBottleInfo(tGasBottleInfo);
+    }
+
+    /**
+     * 批量删除气瓶信息
+     * 
+     * @param bottleIds 需要删除的气瓶信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTGasBottleInfoByIds(Long[] bottleIds)
+    {
+        return tGasBottleInfoMapper.deleteTGasBottleInfoByIds(bottleIds);
+    }
+
+    /**
+     * 删除气瓶信息信息
+     * 
+     * @param bottleId 气瓶信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTGasBottleInfoById(Long bottleId)
+    {
+        return tGasBottleInfoMapper.deleteTGasBottleInfoById(bottleId);
+    }
+
+    /**
+     * 气瓶数据导出
+     * @param tGasBottleInfoList 气瓶实体
+     * @param isUpdateSupport 是否更新
+     * @return
+     */
+    @Override
+    public String importTGasBottleInfo(List<TGasBottleInfo> tGasBottleInfoList,Boolean isUpdateSupport){
+        if (StringUtils.isNull(tGasBottleInfoList) || tGasBottleInfoList.size() == 0){
+            throw new CustomException("导入数据不能为空！");
+        }
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (TGasBottleInfo tGasBottleInfo : tGasBottleInfoList){
+            try {
+                //查询储配站信息
+                TGasStorageStationInfo queryGasStorageStationInfo = new TGasStorageStationInfo();
+                queryGasStorageStationInfo.setStationName(tGasBottleInfo.getStationName());
+                List<TGasStorageStationInfo> gasStorageStationInfo = tGasStorageStationInfoMapper.selectTGasStorageStationInfoList(queryGasStorageStationInfo);
+                if(CollectionUtils.isEmpty(gasStorageStationInfo)){
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、气瓶条码为 " + tGasBottleInfo.getBottleCode() +"、储配站" + tGasBottleInfo.getStationName() + " 不存在请创建或导入");
+                    continue;
+                }
+                TGasBottleInfo gasBottleInfo = new TGasBottleInfo();
+                gasBottleInfo.setBottleCode(tGasBottleInfo.getBottleCode());
+                List<TGasBottleInfo> queryGasBottleInfo = tGasBottleInfoMapper.selectTGasBottleInfoList(gasBottleInfo);
+                if (StringUtils.isNull(queryGasBottleInfo) || queryGasBottleInfo.size() == 0){
+                    tGasBottleInfo.setStationId(gasStorageStationInfo.get(0).getStationId());
+                    this.insertTGasBottleInfo(tGasBottleInfo);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、气瓶条码 " + tGasBottleInfo.getBottleCode() + " 导入成功");
+                }else if (isUpdateSupport){
+                    queryGasBottleInfo.stream().forEach(bottleInfo ->{
+                        tGasBottleInfo.setBottleId(bottleInfo.getBottleId());
+                        tGasBottleInfo.setStationId(gasStorageStationInfo.get(0).getStationId());
+                        this.updateTGasBottleInfo(tGasBottleInfo);
+                    });
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、气瓶条码 " + tGasBottleInfo.getBottleCode() + " 更新成功");
+                }else{
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、气瓶条码 " + tGasBottleInfo.getBottleCode() + " 已存在");
+                }
+            }
+            catch (Exception e)
+            {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、气瓶条码 " + tGasBottleInfo.getBottleCode() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+        }
+        if (failureNum > 0)
+        {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new CustomException(failureMsg.toString());
+        }
+        else
+        {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
+    /**
+     * 气瓶统计
+     * @param stationId 储配站id
+     * @return
+     */
+    @Override
+    public List<BottleStatistics> bottleStatistics(Long stationId){
+        return tGasBottleInfoMapper.bottleStatistics(stationId);
+    }
+}

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

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.TAirChargeRecord;
+import com.zehong.system.mapper.TAirChargeRecordMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TGasBottleTrackRecordMapper;
+import com.zehong.system.domain.TGasBottleTrackRecord;
+import com.zehong.system.service.ITGasBottleTrackRecordService;
+
+import javax.annotation.Resource;
+
+/**
+ * 气瓶追溯Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-08-18
+ */
+@Service
+public class TGasBottleTrackRecordServiceImpl implements ITGasBottleTrackRecordService 
+{
+    @Autowired
+    private TGasBottleTrackRecordMapper tGasBottleTrackRecordMapper;
+
+    @Resource
+    private TAirChargeRecordMapper tAirChargeRecordMapper;
+
+    /**
+     * 查询气瓶追溯
+     * 
+     * @param trackRecordId 气瓶追溯ID
+     * @return 气瓶追溯
+     */
+    @Override
+    public TGasBottleTrackRecord selectTGasBottleTrackRecordById(Long trackRecordId)
+    {
+        return tGasBottleTrackRecordMapper.selectTGasBottleTrackRecordById(trackRecordId);
+    }
+
+    /**
+     * 查询气瓶追溯列表
+     * 
+     * @param tGasBottleTrackRecord 气瓶追溯
+     * @return 气瓶追溯
+     */
+    @Override
+    public List<TGasBottleTrackRecord> selectTGasBottleTrackRecordList(TGasBottleTrackRecord tGasBottleTrackRecord)
+    {
+        List<TGasBottleTrackRecord> records = tGasBottleTrackRecordMapper.selectTGasBottleTrackRecordList(tGasBottleTrackRecord);
+        records.stream().forEach(item ->{
+            StringBuilder massage = new StringBuilder("");
+            if("0".equals(item.getProcessesName())){
+                TAirChargeRecord charge = tAirChargeRecordMapper.selectTAirChargeRecordById(item.getProcessesRelationId());
+                massage.append("由【 "+ charge.getStationName() +" 】")
+                        .append("从业人员【 " + charge.getChargeOperatorName() + " 】,")
+                        .append("给编号【 " + charge.getBottleCode() + " 】气瓶充气成功");
+            }
+            if("1".equals(item.getProcessesName())){
+                massage.append("由【 "+ item.getStationName() +" 】")
+                        .append("配送人员"+ item.getOperatorName() +" 联系电话")
+                        .append("配送气瓶到客户【】")
+                        .append("联系电话");
+            }
+            if("2".equals(item.getProcessesName())){
+                massage.append("由从业人员【 " + item.getOperatorName() + " 】")
+                       .append("回收编号【 "+ item.getBottleCode() +" 】气瓶");
+            }
+            item.setMessageInfo(massage.toString());
+        });
+        return records;
+    }
+
+    /**
+     * 新增气瓶追溯
+     * 
+     * @param tGasBottleTrackRecord 气瓶追溯
+     * @return 结果
+     */
+    @Override
+    public int insertTGasBottleTrackRecord(TGasBottleTrackRecord tGasBottleTrackRecord)
+    {
+        tGasBottleTrackRecord.setCreateTime(DateUtils.getNowDate());
+        return tGasBottleTrackRecordMapper.insertTGasBottleTrackRecord(tGasBottleTrackRecord);
+    }
+
+    /**
+     * 修改气瓶追溯
+     * 
+     * @param tGasBottleTrackRecord 气瓶追溯
+     * @return 结果
+     */
+    @Override
+    public int updateTGasBottleTrackRecord(TGasBottleTrackRecord tGasBottleTrackRecord)
+    {
+        tGasBottleTrackRecord.setUpdateTime(DateUtils.getNowDate());
+        return tGasBottleTrackRecordMapper.updateTGasBottleTrackRecord(tGasBottleTrackRecord);
+    }
+
+    /**
+     * 批量删除气瓶追溯
+     * 
+     * @param trackRecordIds 需要删除的气瓶追溯ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTGasBottleTrackRecordByIds(Long[] trackRecordIds)
+    {
+        return tGasBottleTrackRecordMapper.deleteTGasBottleTrackRecordByIds(trackRecordIds);
+    }
+
+    /**
+     * 删除气瓶追溯信息
+     * 
+     * @param trackRecordId 气瓶追溯ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTGasBottleTrackRecordById(Long trackRecordId)
+    {
+        return tGasBottleTrackRecordMapper.deleteTGasBottleTrackRecordById(trackRecordId);
+    }
+}

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

+package com.zehong.system.service.impl;
+
+import com.zehong.common.exception.CustomException;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.StringUtils;
+import com.zehong.system.domain.BaseInfoStatistics;
+import com.zehong.system.domain.TGasStorageStationInfo;
+import com.zehong.system.mapper.TGasStorageStationInfoMapper;
+import com.zehong.system.service.ITGasStorageStationInfoService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 储配站信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-08-14
+ */
+@Service
+public class TGasStorageStationInfoServiceImpl implements ITGasStorageStationInfoService 
+{
+    private static final Logger log = LoggerFactory.getLogger(TGasStorageStationInfoServiceImpl.class);
+
+    @Autowired
+    private TGasStorageStationInfoMapper tGasStorageStationInfoMapper;
+
+    /**
+     * 查询储配站信息
+     * 
+     * @param stationId 储配站信息ID
+     * @return 储配站信息
+     */
+    @Override
+    public TGasStorageStationInfo selectTGasStorageStationInfoById(Long stationId)
+    {
+        return tGasStorageStationInfoMapper.selectTGasStorageStationInfoById(stationId);
+    }
+
+    /**
+     * 查询储配站信息列表
+     * 
+     * @param tGasStorageStationInfo 储配站信息
+     * @return 储配站信息
+     */
+    @Override
+    public List<TGasStorageStationInfo> selectTGasStorageStationInfoList(TGasStorageStationInfo tGasStorageStationInfo)
+    {
+        return tGasStorageStationInfoMapper.selectTGasStorageStationInfoList(tGasStorageStationInfo);
+    }
+
+    /**
+     * 新增储配站信息
+     * 
+     * @param tGasStorageStationInfo 储配站信息
+     * @return 结果
+     */
+    @Override
+    public int insertTGasStorageStationInfo(TGasStorageStationInfo tGasStorageStationInfo)
+    {
+        tGasStorageStationInfo.setCreateTime(DateUtils.getNowDate());
+        return tGasStorageStationInfoMapper.insertTGasStorageStationInfo(tGasStorageStationInfo);
+    }
+
+    /**
+     * 修改储配站信息
+     * 
+     * @param tGasStorageStationInfo 储配站信息
+     * @return 结果
+     */
+    @Override
+    public int updateTGasStorageStationInfo(TGasStorageStationInfo tGasStorageStationInfo)
+    {
+        tGasStorageStationInfo.setUpdateTime(DateUtils.getNowDate());
+        return tGasStorageStationInfoMapper.updateTGasStorageStationInfo(tGasStorageStationInfo);
+    }
+
+    /**
+     * 批量删除储配站信息
+     * 
+     * @param stationIds 需要删除的储配站信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTGasStorageStationInfoByIds(Long[] stationIds)
+    {
+        return tGasStorageStationInfoMapper.deleteTGasStorageStationInfoByIds(stationIds);
+    }
+
+    /**
+     * 删除储配站信息信息
+     * 
+     * @param stationId 储配站信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTGasStorageStationInfoById(Long stationId)
+    {
+        return tGasStorageStationInfoMapper.deleteTGasStorageStationInfoById(stationId);
+    }
+
+    /**
+     * 导入数据
+     *
+     * @param tGasStorageStationInfoList 数据列表
+     * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
+     * @return 结果
+     */
+    @Override
+    public String importTGasStorageStationInfo(List<TGasStorageStationInfo> tGasStorageStationInfoList, Boolean isUpdateSupport){
+        if (StringUtils.isNull(tGasStorageStationInfoList) || tGasStorageStationInfoList.size() == 0){
+            throw new CustomException("导入数据不能为空！");
+        }
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (TGasStorageStationInfo tGasStorageStationInfo : tGasStorageStationInfoList)
+        {
+            try {
+                TGasStorageStationInfo queryGasStorageStationInfo = new TGasStorageStationInfo();
+                queryGasStorageStationInfo.setStationName(tGasStorageStationInfo.getStationName());
+                List<TGasStorageStationInfo> gasStorageStationInfos = tGasStorageStationInfoMapper.selectTGasStorageStationInfoList(queryGasStorageStationInfo);
+                if (StringUtils.isNull(gasStorageStationInfos) || gasStorageStationInfos.size() == 0){
+                    this.insertTGasStorageStationInfo(tGasStorageStationInfo);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、储配站 " + tGasStorageStationInfo.getStationName() + " 导入成功");
+                }
+                else if (isUpdateSupport){
+                    gasStorageStationInfos.stream().forEach(stationInfo ->{
+                        tGasStorageStationInfo.setStationId(stationInfo.getStationId());
+                        this.updateTGasStorageStationInfo(tGasStorageStationInfo);
+                    });
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、储配站 " + tGasStorageStationInfo.getStationName() + " 更新成功");
+                }else{
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、储配站 " + tGasStorageStationInfo.getStationName() + " 已存在");
+                }
+            }
+            catch (Exception e)
+            {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、储配站 " + tGasStorageStationInfo.getStationName() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+        }
+        if (failureNum > 0)
+        {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new CustomException(failureMsg.toString());
+        }
+        else
+        {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+
+     /**
+     * 基础信息统计
+     * @param stationId 储配站id
+     * @return
+     */
+     @Override
+     public List<BaseInfoStatistics> baseInfoStatistics(Long stationId){
+         return tGasStorageStationInfoMapper.baseInfoStatistics(stationId);
+     }
+}

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

+package com.zehong.system.service.impl;
+
+import java.util.List;
+
+import com.zehong.common.exception.CustomException;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.StringUtils;
+import com.zehong.system.domain.SysPost;
+import com.zehong.system.domain.TGasStorageStationInfo;
+import com.zehong.system.domain.TPractitionerInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TGasUserInfoMapper;
+import com.zehong.system.domain.TGasUserInfo;
+import com.zehong.system.service.ITGasUserInfoService;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * 燃气用户Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-08-17
+ */
+@Service
+public class TGasUserInfoServiceImpl implements ITGasUserInfoService 
+{
+    private static final Logger log = LoggerFactory.getLogger(TGasUserInfoServiceImpl.class);
+
+    @Autowired
+    private TGasUserInfoMapper tGasUserInfoMapper;
+
+    /**
+     * 查询燃气用户
+     * 
+     * @param gasUserId 燃气用户ID
+     * @return 燃气用户
+     */
+    @Override
+    public TGasUserInfo selectTGasUserInfoById(Long gasUserId)
+    {
+        return tGasUserInfoMapper.selectTGasUserInfoById(gasUserId);
+    }
+
+    /**
+     * 查询燃气用户列表
+     * 
+     * @param tGasUserInfo 燃气用户
+     * @return 燃气用户
+     */
+    @Override
+    public List<TGasUserInfo> selectTGasUserInfoList(TGasUserInfo tGasUserInfo)
+    {
+        return tGasUserInfoMapper.selectTGasUserInfoList(tGasUserInfo);
+    }
+
+    /**
+     * 新增燃气用户
+     * 
+     * @param tGasUserInfo 燃气用户
+     * @return 结果
+     */
+    @Override
+    public int insertTGasUserInfo(TGasUserInfo tGasUserInfo)
+    {
+        tGasUserInfo.setCreateTime(DateUtils.getNowDate());
+        return tGasUserInfoMapper.insertTGasUserInfo(tGasUserInfo);
+    }
+
+    /**
+     * 修改燃气用户
+     * 
+     * @param tGasUserInfo 燃气用户
+     * @return 结果
+     */
+    @Override
+    public int updateTGasUserInfo(TGasUserInfo tGasUserInfo)
+    {
+        tGasUserInfo.setUpdateTime(DateUtils.getNowDate());
+        return tGasUserInfoMapper.updateTGasUserInfo(tGasUserInfo);
+    }
+
+    /**
+     * 批量删除燃气用户
+     * 
+     * @param gasUserIds 需要删除的燃气用户ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTGasUserInfoByIds(Long[] gasUserIds)
+    {
+        return tGasUserInfoMapper.deleteTGasUserInfoByIds(gasUserIds);
+    }
+
+    /**
+     * 删除燃气用户信息
+     * 
+     * @param gasUserId 燃气用户ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTGasUserInfoById(Long gasUserId)
+    {
+        return tGasUserInfoMapper.deleteTGasUserInfoById(gasUserId);
+    }
+
+    /**
+     * 燃气用户导入
+     * @param tGasUserInfoList 燃气用户实体
+     * @param updateSupport 是否更新
+     * @return
+     */
+    @Override
+    public String importTGasUserInfo(List<TGasUserInfo> tGasUserInfoList, boolean isUpdateSupport){
+        if (StringUtils.isNull(tGasUserInfoList) || tGasUserInfoList.size() == 0){
+            throw new CustomException("导入数据不能为空！");
+        }
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (TGasUserInfo tGasUserInfo : tGasUserInfoList){
+            try {
+                TGasUserInfo queryGasUserInfo = new TGasUserInfo();
+                queryGasUserInfo.setGasUserName(tGasUserInfo.getGasUserName());
+                List<TGasUserInfo> queryGasUserInfoList = tGasUserInfoMapper.selectTGasUserInfoList(queryGasUserInfo);
+                if (StringUtils.isNull(queryGasUserInfoList) || queryGasUserInfoList.size() == 0){
+                    this.insertTGasUserInfo(tGasUserInfo);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、燃气用户名称 " + tGasUserInfo.getGasUserName() + " 导入成功");
+                }else if (isUpdateSupport){
+                    tGasUserInfo.setGasUserId(queryGasUserInfoList.get(0).getGasUserId());
+                    this.updateTGasUserInfo(tGasUserInfo);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、燃气用户名称 " + tGasUserInfo.getGasUserName() + " 更新成功");
+                }else{
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、燃气用户名称 " + tGasUserInfo.getGasUserName() + " 已存在");
+                }
+            }
+            catch (Exception e)
+            {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、燃气用户名称 " + tGasUserInfo.getGasUserName() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+        }
+        if (failureNum > 0)
+        {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new CustomException(failureMsg.toString());
+        }
+        else
+        {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+}

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

@@ -2,6 +2,7 @@ package com.zehong.system.service.impl;
 
 import java.util.List;
 import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.Statistics;
 import com.zehong.system.domain.form.THiddenDangerStandingBookForm;
 import com.zehong.system.domain.vo.THiddenDangerStandingBookVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -105,4 +106,14 @@ public class THiddenDangerStandingBookServiceImpl implements ITHiddenDangerStand
     {
         return tHiddenDangerStandingBookMapper.deleteTHiddenDangerStandingBookById(hiddenId);
     }
+
+    /**
+     * 获取隐患整治台账统计信息
+     * @param sevenDate
+     * @return
+     */
+    @Override
+    public List<Statistics> hazardStatistics(List<String> sevenDate) {
+        return tHiddenDangerStandingBookMapper.hazardStatistics(sevenDate);
+    }
 }

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

+package com.zehong.system.service.impl;
+
+import com.zehong.common.exception.CustomException;
+import com.zehong.common.utils.DateUtils;
+import com.zehong.common.utils.StringUtils;
+import com.zehong.system.domain.SysPost;
+import com.zehong.system.domain.TGasStorageStationInfo;
+import com.zehong.system.domain.TPractitionerInfo;
+import com.zehong.system.mapper.SysPostMapper;
+import com.zehong.system.mapper.TGasStorageStationInfoMapper;
+import com.zehong.system.mapper.TPractitionerInfoMapper;
+import com.zehong.system.service.ITPractitionerInfoService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 从业人员信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-08-16
+ */
+@Service
+public class TPractitionerInfoServiceImpl implements ITPractitionerInfoService 
+{
+
+    private static final Logger log = LoggerFactory.getLogger(TPractitionerInfoServiceImpl.class);
+
+    @Autowired
+    private TPractitionerInfoMapper tPractitionerInfoMapper;
+
+    @Resource
+    private TGasStorageStationInfoMapper tGasStorageStationInfoMapper;
+
+    @Resource
+    private SysPostMapper sysPostMapper;
+
+    /**
+     * 查询从业人员信息
+     * 
+     * @param practitionerId 从业人员信息ID
+     * @return 从业人员信息
+     */
+    @Override
+    public TPractitionerInfo selectTPractitionerInfoById(Long practitionerId)
+    {
+        return tPractitionerInfoMapper.selectTPractitionerInfoById(practitionerId);
+    }
+
+    /**
+     * 查询从业人员信息列表
+     * 
+     * @param tPractitionerInfo 从业人员信息
+     * @return 从业人员信息
+     */
+    @Override
+    public List<TPractitionerInfo> selectTPractitionerInfoList(TPractitionerInfo tPractitionerInfo)
+    {
+        return tPractitionerInfoMapper.selectTPractitionerInfoList(tPractitionerInfo);
+    }
+
+    /**
+     * 新增从业人员信息
+     * 
+     * @param tPractitionerInfo 从业人员信息
+     * @return 结果
+     */
+    @Override
+    public int insertTPractitionerInfo(TPractitionerInfo tPractitionerInfo)
+    {
+        tPractitionerInfo.setCreateTime(DateUtils.getNowDate());
+        return tPractitionerInfoMapper.insertTPractitionerInfo(tPractitionerInfo);
+    }
+
+    /**
+     * 修改从业人员信息
+     * 
+     * @param tPractitionerInfo 从业人员信息
+     * @return 结果
+     */
+    @Override
+    public int updateTPractitionerInfo(TPractitionerInfo tPractitionerInfo)
+    {
+        tPractitionerInfo.setUpdateTime(DateUtils.getNowDate());
+        return tPractitionerInfoMapper.updateTPractitionerInfo(tPractitionerInfo);
+    }
+
+    /**
+     * 批量删除从业人员信息
+     * 
+     * @param practitionerIds 需要删除的从业人员信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPractitionerInfoByIds(Long[] practitionerIds)
+    {
+        return tPractitionerInfoMapper.deleteTPractitionerInfoByIds(practitionerIds);
+    }
+
+    /**
+     * 删除从业人员信息信息
+     * 
+     * @param practitionerId 从业人员信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPractitionerInfoById(Long practitionerId)
+    {
+        return tPractitionerInfoMapper.deleteTPractitionerInfoById(practitionerId);
+    }
+
+    /**
+     * 从业人员数据导入
+     * @param tPractitionerInfoList 从业人员实体
+     * @param isUpdateSupport 是否更新
+     * @return
+     */
+    @Override
+    public String importTPractitionerInfo(List<TPractitionerInfo> tPractitionerInfoList, Boolean isUpdateSupport){
+        if (StringUtils.isNull(tPractitionerInfoList) || tPractitionerInfoList.size() == 0){
+            throw new CustomException("导入数据不能为空！");
+        }
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder successMsg = new StringBuilder();
+        StringBuilder failureMsg = new StringBuilder();
+        for (TPractitionerInfo tPractitionerInfo : tPractitionerInfoList){
+            try {
+                //查询储配站信息
+                TGasStorageStationInfo queryGasStorageStationInfo = new TGasStorageStationInfo();
+                queryGasStorageStationInfo.setStationName(tPractitionerInfo.getStationName());
+                //储配站
+                List<TGasStorageStationInfo> gasStorageStationInfo = tGasStorageStationInfoMapper.selectTGasStorageStationInfoList(queryGasStorageStationInfo);
+                if(CollectionUtils.isEmpty(gasStorageStationInfo)){
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、从业人员 " + tPractitionerInfo.getName() +"、储配站" + tPractitionerInfo.getStationName() + " 不存在请创建或导入");
+                    continue;
+                }
+
+                //岗位
+                SysPost post = new SysPost();
+                post.setPostName(tPractitionerInfo.getPostName());
+                List<SysPost> postInfo = sysPostMapper.selectPostList(post);
+                if(CollectionUtils.isEmpty(postInfo)){
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、从业人员 " + tPractitionerInfo.getName() +"、岗位" + tPractitionerInfo.getPostName() + " 不存在请创建");
+                    continue;
+                }
+                TPractitionerInfo query = new TPractitionerInfo();
+                query.setPractitionerNum(tPractitionerInfo.getPractitionerNum());
+                List<TPractitionerInfo> queryPractitionerInfo = tPractitionerInfoMapper.selectTPractitionerInfoList(query);
+                if (StringUtils.isNull(queryPractitionerInfo) || queryPractitionerInfo.size() == 0){
+                    tPractitionerInfo.setStationId(gasStorageStationInfo.get(0).getStationId());
+                    tPractitionerInfo.setPostId(postInfo.get(0).getPostId());
+                    this.insertTPractitionerInfo(tPractitionerInfo);
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、工号 " + tPractitionerInfo.getPractitionerNum() + " 导入成功");
+                }else if (isUpdateSupport){
+                    queryPractitionerInfo.stream().forEach(practitionerInfo ->{
+                        tPractitionerInfo.setPractitionerId(practitionerInfo.getPractitionerId());
+                        tPractitionerInfo.setStationId(gasStorageStationInfo.get(0).getStationId());
+                        tPractitionerInfo.setPostId(postInfo.get(0).getPostId());
+                        this.updateTPractitionerInfo(tPractitionerInfo);
+                    });
+                    successNum++;
+                    successMsg.append("<br/>" + successNum + "、工号 " + tPractitionerInfo.getPractitionerNum() + " 更新成功");
+                }else{
+                    failureNum++;
+                    failureMsg.append("<br/>" + failureNum + "、工号 " + tPractitionerInfo.getPractitionerNum() + " 已存在");
+                }
+            }
+            catch (Exception e)
+            {
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、工号 " + tPractitionerInfo.getPractitionerNum() + " 导入失败：";
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+        }
+        if (failureNum > 0)
+        {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new CustomException(failureMsg.toString());
+        }
+        else
+        {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        }
+        return successMsg.toString();
+    }
+}

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TSafeCheckRecordServiceImpl.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.TSafeCheckRecordMapper;
+import com.zehong.system.domain.TSafeCheckRecord;
+import com.zehong.system.service.ITSafeCheckRecordService;
+
+/**
+ * 安检记录Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-08-21
+ */
+@Service
+public class TSafeCheckRecordServiceImpl implements ITSafeCheckRecordService 
+{
+    @Autowired
+    private TSafeCheckRecordMapper tSafeCheckRecordMapper;
+
+    /**
+     * 查询安检记录
+     * 
+     * @param safeCheckId 安检记录ID
+     * @return 安检记录
+     */
+    @Override
+    public TSafeCheckRecord selectTSafeCheckRecordById(Long safeCheckId)
+    {
+        return tSafeCheckRecordMapper.selectTSafeCheckRecordById(safeCheckId);
+    }
+
+    /**
+     * 查询安检记录列表
+     * 
+     * @param tSafeCheckRecord 安检记录
+     * @return 安检记录
+     */
+    @Override
+    public List<TSafeCheckRecord> selectTSafeCheckRecordList(TSafeCheckRecord tSafeCheckRecord)
+    {
+        return tSafeCheckRecordMapper.selectTSafeCheckRecordList(tSafeCheckRecord);
+    }
+
+    /**
+     * 新增安检记录
+     * 
+     * @param tSafeCheckRecord 安检记录
+     * @return 结果
+     */
+    @Override
+    public int insertTSafeCheckRecord(TSafeCheckRecord tSafeCheckRecord)
+    {
+        tSafeCheckRecord.setCreateTime(DateUtils.getNowDate());
+        return tSafeCheckRecordMapper.insertTSafeCheckRecord(tSafeCheckRecord);
+    }
+
+    /**
+     * 修改安检记录
+     * 
+     * @param tSafeCheckRecord 安检记录
+     * @return 结果
+     */
+    @Override
+    public int updateTSafeCheckRecord(TSafeCheckRecord tSafeCheckRecord)
+    {
+        tSafeCheckRecord.setUpdateTime(DateUtils.getNowDate());
+        return tSafeCheckRecordMapper.updateTSafeCheckRecord(tSafeCheckRecord);
+    }
+
+    /**
+     * 批量删除安检记录
+     * 
+     * @param safeCheckIds 需要删除的安检记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTSafeCheckRecordByIds(Long[] safeCheckIds)
+    {
+        return tSafeCheckRecordMapper.deleteTSafeCheckRecordByIds(safeCheckIds);
+    }
+
+    /**
+     * 删除安检记录信息
+     * 
+     * @param safeCheckId 安检记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTSafeCheckRecordById(Long safeCheckId)
+    {
+        return tSafeCheckRecordMapper.deleteTSafeCheckRecordById(safeCheckId);
+    }
+}

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

@@ -2,6 +2,7 @@ package com.zehong.system.service.impl;
 
 import java.util.List;
 import com.zehong.common.utils.DateUtils;
+import com.zehong.system.domain.Statistics;
 import com.zehong.system.domain.form.TTroubleStandingBookForm;
 import com.zehong.system.domain.vo.TTroubleStandingBookVo;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -111,4 +112,17 @@ public class TTroubleStandingBookServiceImpl implements ITTroubleStandingBookSer
     {
         return tTroubleStandingBookMapper.deleteTTroubleStandingBookById(troubleId);
     }
+
+    /**
+     * 查询统计信息
+     * @param sevenDate
+     * @return
+     */
+    @Override
+    public List<Statistics> accidentLedger(List<String> sevenDate) {
+
+
+
+        return tTroubleStandingBookMapper.accidentLedger(sevenDate);
+    }
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/TVehicleUseRecordServiceImpl.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.TVehicleUseRecordMapper;
+import com.zehong.system.domain.TVehicleUseRecord;
+import com.zehong.system.service.ITVehicleUseRecordService;
+
+/**
+ * 车辆使用记录Service业务层处理
+ * 
+ * @author zehong
+ * @date 2023-08-19
+ */
+@Service
+public class TVehicleUseRecordServiceImpl implements ITVehicleUseRecordService 
+{
+    @Autowired
+    private TVehicleUseRecordMapper tVehicleUseRecordMapper;
+
+    /**
+     * 查询车辆使用记录
+     * 
+     * @param vehicleUseRecordId 车辆使用记录ID
+     * @return 车辆使用记录
+     */
+    @Override
+    public TVehicleUseRecord selectTVehicleUseRecordById(Long vehicleUseRecordId)
+    {
+        return tVehicleUseRecordMapper.selectTVehicleUseRecordById(vehicleUseRecordId);
+    }
+
+    /**
+     * 查询车辆使用记录列表
+     * 
+     * @param tVehicleUseRecord 车辆使用记录
+     * @return 车辆使用记录
+     */
+    @Override
+    public List<TVehicleUseRecord> selectTVehicleUseRecordList(TVehicleUseRecord tVehicleUseRecord)
+    {
+        return tVehicleUseRecordMapper.selectTVehicleUseRecordList(tVehicleUseRecord);
+    }
+
+    /**
+     * 新增车辆使用记录
+     * 
+     * @param tVehicleUseRecord 车辆使用记录
+     * @return 结果
+     */
+    @Override
+    public int insertTVehicleUseRecord(TVehicleUseRecord tVehicleUseRecord)
+    {
+        tVehicleUseRecord.setCreateTime(DateUtils.getNowDate());
+        return tVehicleUseRecordMapper.insertTVehicleUseRecord(tVehicleUseRecord);
+    }
+
+    /**
+     * 修改车辆使用记录
+     * 
+     * @param tVehicleUseRecord 车辆使用记录
+     * @return 结果
+     */
+    @Override
+    public int updateTVehicleUseRecord(TVehicleUseRecord tVehicleUseRecord)
+    {
+        tVehicleUseRecord.setUpdateTime(DateUtils.getNowDate());
+        return tVehicleUseRecordMapper.updateTVehicleUseRecord(tVehicleUseRecord);
+    }
+
+    /**
+     * 批量删除车辆使用记录
+     * 
+     * @param vehicleUseRecordIds 需要删除的车辆使用记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTVehicleUseRecordByIds(Long[] vehicleUseRecordIds)
+    {
+        return tVehicleUseRecordMapper.deleteTVehicleUseRecordByIds(vehicleUseRecordIds);
+    }
+
+    /**
+     * 删除车辆使用记录信息
+     * 
+     * @param vehicleUseRecordId 车辆使用记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTVehicleUseRecordById(Long vehicleUseRecordId)
+    {
+        return tVehicleUseRecordMapper.deleteTVehicleUseRecordById(vehicleUseRecordId);
+    }
+}

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

@@ -6,6 +6,7 @@
      <!--管道-->
     <resultMap type="PipeDate" id="PipeDateResult">
         <result property="pipeId"    column="pipe_id"    />
+        <result property="pipePressure"    column="pipe_pressure"    />
         <result property="pipeDiameter"    column="pipe_diameter"    />
         <result property="pipeMaterial"     column="pipe_material"     />
         <result property="pipeDepth"   column="buried_depth"   />
@@ -85,6 +86,8 @@
     <resultMap type="TenterpriseInfoData" id="TenterpriseInfoDataResult">
         <result property="enterpriseId"    column="enterprise_id"    />
         <result property="enterpriseName"    column="enterprise_name"    />
+        <result property="enterpriseType"    column="enterprise_type"    />
+
     </resultMap>
 
     <!--感知设备列表-->
@@ -100,7 +103,7 @@
 
     <!--查询管道数据列表-->
     <select id="selectPipeData" parameterType="PipeDate" resultMap="PipeDateResult">
-        select format(pipe_length,2)pipe_length,beyond_enterprise_id,pipe_id,pipe_diameter,pipe_material,buried_depth,pipe_trend,build_date,pipe_addr,coordinates,remarks,build_unit,beyond_enterprise_name from t_pipe_info
+        select format(pipe_length,2)pipe_length,pipe_pressure,beyond_enterprise_id,pipe_id,pipe_diameter,pipe_material,buried_depth,pipe_trend,build_date,pipe_addr,coordinates,remarks,build_unit,beyond_enterprise_name from t_pipe_info
         where is_del='0'
     </select>
 
@@ -149,7 +152,7 @@
 
     <!--查询企业名称id方法-->
     <select id="selectTenterpriseInfoData" resultMap="TenterpriseInfoDataResult">
-        select enterprise_id,enterprise_name from t_enterprise_info where is_del='0'
+        select enterprise_id,enterprise_name,enterprise_type from t_enterprise_info where is_del='0'
     </select>
 
     <!--查询阀门井数据-->

gassafetyprogress-system/src/main/resources/mapper/system/TAirChargeRecordMapper.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.TAirChargeRecordMapper">
+    
+    <resultMap type="TAirChargeRecord" id="TAirChargeRecordResult">
+        <result property="chargeRecordId"    column="charge_record_id"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="bottleId"    column="bottle_id"    />
+        <result property="chargeOperator"    column="charge_operator"    />
+        <result property="chargeMeasure"    column="charge_measure"    />
+        <result property="chargeDate"    column="charge_date"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remark"    column="remark"    />
+        <result property="stationName" column="station_name"/>
+        <result property="bottleCode" column="bottle_code"/>
+        <result property="bottleCapacity" column="bottle_capacity"/>
+        <result property="bottleStatus" column="bottle_status"/>
+        <result property="chargeOperatorName" column="charge_operator_name"/>
+    </resultMap>
+
+    <sql id="selectTAirChargeRecordVo">
+        SELECT
+            charge.charge_record_id,
+            charge.station_id,
+            charge.bottle_id,
+            charge.charge_operator,
+            charge.charge_measure,
+            charge.charge_date,
+            charge.create_time,
+            charge.update_time,
+            charge.is_del,
+            charge.remark,
+            station.station_name,
+            bottle.bottle_code,
+            bottle.bottle_capacity,
+            bottle.bottle_status,
+            pr.name AS charge_operator_name
+        FROM
+            t_air_charge_record charge
+        LEFT JOIN t_gas_storage_station_info station ON station.station_id = charge.station_id
+        LEFT JOIN t_gas_bottle_info bottle ON bottle.bottle_id = charge.bottle_id
+        LEFT JOIN t_practitioner_info pr ON pr.practitioner_id = charge.charge_operator
+    </sql>
+
+    <select id="selectTAirChargeRecordList" parameterType="TAirChargeRecord" resultMap="TAirChargeRecordResult">
+        <include refid="selectTAirChargeRecordVo"/>
+        <where>  
+            <if test="stationId != null "> and charge.station_id = #{stationId}</if>
+            <if test="bottleId != null "> and charge.bottle_id = #{bottleId}</if>
+            <if test="chargeOperator != null "> and charge.charge_operator = #{chargeOperator}</if>
+            <if test="chargeMeasure != null  and chargeMeasure != ''"> and charge.charge_measure = #{chargeMeasure}</if>
+            <if test="chargeDate != null "> and charge.charge_date = #{chargeDate}</if>
+            <if test="isDel != null  and isDel != ''"> and charge.is_del = #{isDel}</if>
+            <if test="chargeBeginTime != null and chargeEndTime != null">and charge.charge_date BETWEEN #{chargeBeginTime} and #{chargeEndTime}</if>
+            <if test="bottleCode != null">and bottle.bottle_code like concat('%', #{bottleCode}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectTAirChargeRecordById" parameterType="Long" resultMap="TAirChargeRecordResult">
+        <include refid="selectTAirChargeRecordVo"/>
+        where charge.charge_record_id = #{chargeRecordId}
+    </select>
+        
+    <insert id="insertTAirChargeRecord" parameterType="TAirChargeRecord" useGeneratedKeys="true" keyProperty="chargeRecordId">
+        insert into t_air_charge_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">station_id,</if>
+            <if test="bottleId != null">bottle_id,</if>
+            <if test="chargeOperator != null">charge_operator,</if>
+            <if test="chargeMeasure != null">charge_measure,</if>
+            <if test="chargeDate != null">charge_date,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">#{stationId},</if>
+            <if test="bottleId != null">#{bottleId},</if>
+            <if test="chargeOperator != null">#{chargeOperator},</if>
+            <if test="chargeMeasure != null">#{chargeMeasure},</if>
+            <if test="chargeDate != null">#{chargeDate},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTAirChargeRecord" parameterType="TAirChargeRecord">
+        update t_air_charge_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="bottleId != null">bottle_id = #{bottleId},</if>
+            <if test="chargeOperator != null">charge_operator = #{chargeOperator},</if>
+            <if test="chargeMeasure != null">charge_measure = #{chargeMeasure},</if>
+            <if test="chargeDate != null">charge_date = #{chargeDate},</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>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where charge_record_id = #{chargeRecordId}
+    </update>
+
+    <delete id="deleteTAirChargeRecordById" parameterType="Long">
+        delete from t_air_charge_record where charge_record_id = #{chargeRecordId}
+    </delete>
+
+    <delete id="deleteTAirChargeRecordByIds" parameterType="String">
+        delete from t_air_charge_record where charge_record_id in 
+        <foreach item="chargeRecordId" collection="array" open="(" separator="," close=")">
+            #{chargeRecordId}
+        </foreach>
+    </delete>
+
+
+    <select id="airChargeStationStatistics" parameterType="com.zehong.system.domain.vo.AirChargeStatisticsVo" resultType="com.zehong.system.domain.AirChargeStationStatistics">
+        select
+          station.station_name as stationName,
+          count(air.charge_record_id)as bottleNum,
+          sum(air.charge_measure) as chargeMeasure
+        from
+            t_air_charge_record air
+        left join t_gas_storage_station_info station on station.station_id = air.station_id
+        left join t_gas_bottle_info bottle on bottle.bottle_id = air.bottle_id
+        left join t_practitioner_info pr ON pr.practitioner_id = air.charge_operator
+        <where>
+            <if test="stationId != null">
+                and air.station_id = #{stationId}
+            </if>
+            <if test="operator != null">
+                and pr.name like concat('%', #{operator}, '%')
+            </if>
+            <if test="operateBeginTime != null and operateEndTime != null" >
+                and air.charge_date between #{operateBeginTime} and #{operateEndTime}
+            </if>
+        </where>
+        group by air.station_id
+    </select>
+
+    <select id="airChargeOperatorStatistics" parameterType="com.zehong.system.domain.vo.AirChargeStatisticsVo" resultType="com.zehong.system.domain.AirChargeOperatorStatistics">
+        select
+          station.station_name as stationName,
+          count(air.charge_record_id)as bottleNum,
+          sum(air.charge_measure) as chargeMeasure,
+          pr.name as operator
+        from
+            t_air_charge_record air
+        left join t_gas_storage_station_info station on station.station_id = air.station_id
+        left join t_gas_bottle_info bottle on bottle.bottle_id = air.bottle_id
+        left join t_practitioner_info pr ON pr.practitioner_id = air.charge_operator
+        <where>
+            <if test="stationId != null">
+                and air.station_id = #{stationId}
+            </if>
+            <if test="operator != null">
+                and pr.name like concat('%', #{operator}, '%')
+            </if>
+            <if test="operateBeginTime != null and operateEndTime != null" >
+                and air.charge_date between #{operateBeginTime} and #{operateEndTime}
+            </if>
+        </where>
+        group by air.station_id,air.charge_operator
+    </select>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TDeliveryRecordMapper.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.TDeliveryRecordMapper">
+
+    <resultMap type="TDeliveryRecord" id="TDeliveryRecordResult">
+        <result property="deliveryRecordId"    column="delivery_record_id"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="bottleId"    column="bottle_id"    />
+        <result property="deliveryPerson"    column="delivery_person"    />
+        <result property="vehicleCode"    column="vehicle_code"    />
+        <result property="gasUserId"    column="gas_user_id"    />
+        <result property="deliveryAddress"    column="delivery_address"    />
+        <result property="deliveryDate"    column="delivery_date"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="bottleCode"    column="bottle_code"    />
+        <result property="bottleSpecs"    column="bottle_specs"    />
+        <result property="bottleStatus"    column="bottle_status"    />
+        <result property="gasUserName"    column="gas_user_name"    />
+        <result property="gasUserType"    column="gas_user_type"    />
+
+    </resultMap>
+
+    <sql id="selectTDeliveryRecordVo">
+        select delivery_record_id, station_id, bottle_id, delivery_person, vehicle_code, gas_user_id, delivery_address, delivery_date, create_time, update_time, is_del, remark from t_delivery_record
+    </sql>
+
+    <select id="selectTDeliveryRecordList" parameterType="TDeliveryRecord" resultMap="TDeliveryRecordResult">
+        select a.delivery_record_id, a.station_id, a.bottle_id, a.delivery_person, a.vehicle_code, a.gas_user_id, a.delivery_address, a.delivery_date, a.create_time, a.update_time,  a.remark,
+        b.station_name,c.bottle_code,c.bottle_specs,c.bottle_status,a.delivery_address,a.delivery_date,d.gas_user_name,d.gas_user_type
+        from t_delivery_record a
+        left join t_gas_storage_station_info b on a.station_id=b.station_id
+        left join t_gas_bottle_info c on a.bottle_id=c.bottle_id
+        left join t_gas_user_info d on a.gas_user_id=d.gas_user_id
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="bottleId != null "> and a.bottle_id = #{bottleId}</if>
+            <if test="deliveryPerson != null "> and a.delivery_person = #{deliveryPerson}</if>
+            <if test="vehicleCode != null  and vehicleCode != ''"> and a.vehicle_code = #{vehicleCode}</if>
+            <if test="gasUserId != null "> and a.gas_user_id = #{gasUserId}</if>
+            <if test="deliveryAddress != null  and deliveryAddress != ''"> and a.delivery_address = #{deliveryAddress}</if>
+            <if test="deliveryDate != null "> and a.delivery_date = #{deliveryDate}</if>
+        </where>
+    </select>
+
+    <select id="selectTDeliveryRecordById" parameterType="Long" resultMap="TDeliveryRecordResult">
+        select a.delivery_record_id, a.station_id, a.bottle_id, a.delivery_person, a.vehicle_code, a.gas_user_id, a.delivery_address, a.delivery_date, a.create_time, a.update_time,  a.remark,
+        b.station_name,c.bottle_code,c.bottle_specs,c.bottle_status,a.delivery_address,a.delivery_date,d.gas_user_name,d.gas_user_type
+        from t_delivery_record a
+        left join t_gas_storage_station_info b on a.station_id=b.station_id
+        left join t_gas_bottle_info c on a.bottle_id=c.bottle_id
+        left join t_gas_user_info d on a.gas_user_id=d.gas_user_id
+        where a.delivery_record_id = #{deliveryRecordId}
+    </select>
+
+    <insert id="insertTDeliveryRecord" parameterType="TDeliveryRecord" useGeneratedKeys="true" keyProperty="deliveryRecordId">
+        insert into t_delivery_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">station_id,</if>
+            <if test="bottleId != null">bottle_id,</if>
+            <if test="deliveryPerson != null">delivery_person,</if>
+            <if test="vehicleCode != null">vehicle_code,</if>
+            <if test="gasUserId != null">gas_user_id,</if>
+            <if test="deliveryAddress != null">delivery_address,</if>
+            <if test="deliveryDate != null">delivery_date,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">#{stationId},</if>
+            <if test="bottleId != null">#{bottleId},</if>
+            <if test="deliveryPerson != null">#{deliveryPerson},</if>
+            <if test="vehicleCode != null">#{vehicleCode},</if>
+            <if test="gasUserId != null">#{gasUserId},</if>
+            <if test="deliveryAddress != null">#{deliveryAddress},</if>
+            <if test="deliveryDate != null">#{deliveryDate},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTDeliveryRecord" parameterType="TDeliveryRecord">
+        update t_delivery_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="bottleId != null">bottle_id = #{bottleId},</if>
+            <if test="deliveryPerson != null">delivery_person = #{deliveryPerson},</if>
+            <if test="vehicleCode != null">vehicle_code = #{vehicleCode},</if>
+            <if test="gasUserId != null">gas_user_id = #{gasUserId},</if>
+            <if test="deliveryAddress != null">delivery_address = #{deliveryAddress},</if>
+            <if test="deliveryDate != null">delivery_date = #{deliveryDate},</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>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where delivery_record_id = #{deliveryRecordId}
+    </update>
+
+    <delete id="deleteTDeliveryRecordById" parameterType="Long">
+        delete from t_delivery_record where delivery_record_id = #{deliveryRecordId}
+    </delete>
+
+    <delete id="deleteTDeliveryRecordByIds" parameterType="String">
+        delete from t_delivery_record where delivery_record_id in
+        <foreach item="deliveryRecordId" collection="array" open="(" separator="," close=")">
+            #{deliveryRecordId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -176,4 +176,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT SUM(IF(user_type=1,1,0)) AS juminNum,SUM(IF(user_type=2,1,0)) AS shangNum,
         SUM(IF(user_type=3,1,0)) AS gongNum FROM t_detector_user WHERE is_del = 0
     </select>
+
+    <!--查询用户统计信息-->
+    <select id="userStatistics" resultType="com.zehong.system.domain.TDetectorUserCount">
+    SELECT
+      (select count(user_id) from t_detector_user   where  is_del='0')as totalNumberUsers,
+      (select count(user_id) from t_detector_user   where user_type=1 and is_del='0')as residentUsers,
+      (select count(user_id) from t_detector_user   where user_type=2 and is_del='0')as businessUser,
+      (select count(user_id) from t_detector_user   where user_type=3 and is_del='0')as industrialUsers
+       FROM `t_detector_user` limit 0,1
+    </select>
 </mapper>

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

@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_enterprise_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="enterpriseName != null">enterprise_name = #{enterpriseName},</if>
-            <if test="enterpriseType!=null"> enterprise_type = #{enterpriseType}</if>
+            <if test="enterpriseType!=null"> enterprise_type = #{enterpriseType},</if>
             <if test="registerAddress != null">register_address = #{registerAddress},</if>
             <if test="legalRepresentative != null">legal_representative = #{legalRepresentative},</if>
             <if test="businessArea != null">business_area = #{businessArea},</if>

gassafetyprogress-system/src/main/resources/mapper/system/TGasBottleInfoMapper.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.TGasBottleInfoMapper">
+    
+    <resultMap type="TGasBottleInfo" id="TGasBottleInfoResult">
+        <result property="bottleId"    column="bottle_id"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="bottleCode"    column="bottle_code"    />
+        <result property="myselfNum"    column="myself_num"    />
+        <result property="produceUnit"    column="produce_unit"    />
+        <result property="produceDate"    column="produce_date"    />
+        <result property="produceCode"    column="produce_code"    />
+        <result property="bottleStatus"    column="bottle_status"    />
+        <result property="lastChargeDate"    column="last_charge_date"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="chargeMedium"    column="charge_medium"    />
+        <result property="bottleSpecs"    column="bottle_specs"    />
+        <result property="ratedPresure"    column="rated_presure"    />
+        <result property="bottleCapacity"    column="bottle_capacity"    />
+        <result property="wallThickness"    column="wall_thickness"    />
+        <result property="tare"    column="tare"    />
+        <result property="useRegisterCode"    column="use_register_code"    />
+        <result property="registerDate"    column="register_date"    />
+        <result property="lastCheckDate"    column="last_check_date"    />
+        <result property="nextCheckDate"    column="next_check_date"    />
+        <result property="scrapDate"    column="scrap_date"    />
+        <result property="currentStatus"    column="current_status"    />
+        <result property="emptyType"    column="empty_type"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remark"    column="remark"    />
+        <result property="stationName" column="station_name"/>
+    </resultMap>
+
+    <sql id="selectTGasBottleInfoVo">
+        SELECT
+            bottle_id,
+            station_id,
+            bottle_code,
+            myself_num,
+            produce_unit,
+            produce_date,
+            produce_code,
+            bottle_status,
+            last_charge_date,
+            longitude,
+            latitude,
+            charge_medium,
+            bottle_specs,
+            rated_presure,
+            bottle_capacity,
+            wall_thickness,
+            tare,
+            use_register_code,
+            register_date,
+            last_check_date,
+            next_check_date,
+            scrap_date,
+            current_status,
+            empty_type,
+            create_time,
+            update_time,
+            is_del,
+            remark,
+           (SELECT station_name FROM t_gas_storage_station_info info WHERE info.station_id = station_id) as station_name
+        FROM
+            t_gas_bottle_info
+    </sql>
+
+    <select id="selectTGasBottleInfoList" parameterType="TGasBottleInfo" resultMap="TGasBottleInfoResult">
+        <include refid="selectTGasBottleInfoVo"/>
+        <where>  
+            <if test="stationId != null "> and station_id = #{stationId}</if>
+            <if test="bottleCode != null  and bottleCode != ''"> and bottle_code = #{bottleCode}</if>
+            <if test="myselfNum != null  and myselfNum != ''"> and myself_num = #{myselfNum}</if>
+            <if test="produceUnit != null  and produceUnit != ''"> and produce_unit = #{produceUnit}</if>
+            <if test="produceDate != null "> and produce_date = #{produceDate}</if>
+            <if test="produceBeginTime != null and produceEndTime">and produce_date between #{produceBeginTime} and #{produceEndTime}</if>
+            <if test="produceCode != null  and produceCode != ''"> and produce_code = #{produceCode}</if>
+            <if test="bottleStatus != null  and bottleStatus != ''"> and bottle_status = #{bottleStatus}</if>
+            <if test="lastChargeDate != null "> and last_charge_date = #{lastChargeDate}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="chargeMedium != null  and chargeMedium != ''"> and charge_medium = #{chargeMedium}</if>
+            <if test="bottleSpecs != null  and bottleSpecs != ''"> and bottle_specs = #{bottleSpecs}</if>
+            <if test="ratedPresure != null  and ratedPresure != ''"> and rated_presure = #{ratedPresure}</if>
+            <if test="bottleCapacity != null  and bottleCapacity != ''"> and bottle_capacity = #{bottleCapacity}</if>
+            <if test="wallThickness != null  and wallThickness != ''"> and wall_thickness = #{wallThickness}</if>
+            <if test="tare != null  and tare != ''"> and tare = #{tare}</if>
+            <if test="useRegisterCode != null  and useRegisterCode != ''"> and use_register_code = #{useRegisterCode}</if>
+            <if test="registerDate != null "> and register_date = #{registerDate}</if>
+            <if test="lastCheckDate != null "> and last_check_date = #{lastCheckDate}</if>
+            <if test="nextCheckDate != null "> and next_check_date = #{nextCheckDate}</if>
+            <if test="scrapDate != null "> and scrap_date = #{scrapDate}</if>
+            <if test="currentStatus != null  and currentStatus != ''"> and current_status = #{currentStatus}</if>
+            <if test="emptyType != null  and emptyType != ''"> and empty_type = #{emptyType}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+        </where>
+    </select>
+    
+    <select id="selectTGasBottleInfoById" parameterType="Long" resultMap="TGasBottleInfoResult">
+        <include refid="selectTGasBottleInfoVo"/>
+        where bottle_id = #{bottleId}
+    </select>
+        
+    <insert id="insertTGasBottleInfo" parameterType="TGasBottleInfo" useGeneratedKeys="true" keyProperty="bottleId">
+        insert into t_gas_bottle_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">station_id,</if>
+            <if test="bottleCode != null">bottle_code,</if>
+            <if test="myselfNum != null">myself_num,</if>
+            <if test="produceUnit != null">produce_unit,</if>
+            <if test="produceDate != null">produce_date,</if>
+            <if test="produceCode != null">produce_code,</if>
+            <if test="bottleStatus != null">bottle_status,</if>
+            <if test="lastChargeDate != null">last_charge_date,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="chargeMedium != null">charge_medium,</if>
+            <if test="bottleSpecs != null">bottle_specs,</if>
+            <if test="ratedPresure != null">rated_presure,</if>
+            <if test="bottleCapacity != null">bottle_capacity,</if>
+            <if test="wallThickness != null">wall_thickness,</if>
+            <if test="tare != null">tare,</if>
+            <if test="useRegisterCode != null">use_register_code,</if>
+            <if test="registerDate != null">register_date,</if>
+            <if test="lastCheckDate != null">last_check_date,</if>
+            <if test="nextCheckDate != null">next_check_date,</if>
+            <if test="scrapDate != null">scrap_date,</if>
+            <if test="currentStatus != null">current_status,</if>
+            <if test="emptyType != null">empty_type,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">#{stationId},</if>
+            <if test="bottleCode != null">#{bottleCode},</if>
+            <if test="myselfNum != null">#{myselfNum},</if>
+            <if test="produceUnit != null">#{produceUnit},</if>
+            <if test="produceDate != null">#{produceDate},</if>
+            <if test="produceCode != null">#{produceCode},</if>
+            <if test="bottleStatus != null">#{bottleStatus},</if>
+            <if test="lastChargeDate != null">#{lastChargeDate},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="chargeMedium != null">#{chargeMedium},</if>
+            <if test="bottleSpecs != null">#{bottleSpecs},</if>
+            <if test="ratedPresure != null">#{ratedPresure},</if>
+            <if test="bottleCapacity != null">#{bottleCapacity},</if>
+            <if test="wallThickness != null">#{wallThickness},</if>
+            <if test="tare != null">#{tare},</if>
+            <if test="useRegisterCode != null">#{useRegisterCode},</if>
+            <if test="registerDate != null">#{registerDate},</if>
+            <if test="lastCheckDate != null">#{lastCheckDate},</if>
+            <if test="nextCheckDate != null">#{nextCheckDate},</if>
+            <if test="scrapDate != null">#{scrapDate},</if>
+            <if test="currentStatus != null">#{currentStatus},</if>
+            <if test="emptyType != null">#{emptyType},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTGasBottleInfo" parameterType="TGasBottleInfo">
+        update t_gas_bottle_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="bottleCode != null">bottle_code = #{bottleCode},</if>
+            <if test="myselfNum != null">myself_num = #{myselfNum},</if>
+            <if test="produceUnit != null">produce_unit = #{produceUnit},</if>
+            <if test="produceDate != null">produce_date = #{produceDate},</if>
+            <if test="produceCode != null">produce_code = #{produceCode},</if>
+            <if test="bottleStatus != null">bottle_status = #{bottleStatus},</if>
+            <if test="lastChargeDate != null">last_charge_date = #{lastChargeDate},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="chargeMedium != null">charge_medium = #{chargeMedium},</if>
+            <if test="bottleSpecs != null">bottle_specs = #{bottleSpecs},</if>
+            <if test="ratedPresure != null">rated_presure = #{ratedPresure},</if>
+            <if test="bottleCapacity != null">bottle_capacity = #{bottleCapacity},</if>
+            <if test="wallThickness != null">wall_thickness = #{wallThickness},</if>
+            <if test="tare != null">tare = #{tare},</if>
+            <if test="useRegisterCode != null">use_register_code = #{useRegisterCode},</if>
+            <if test="registerDate != null">register_date = #{registerDate},</if>
+            <if test="lastCheckDate != null">last_check_date = #{lastCheckDate},</if>
+            <if test="nextCheckDate != null">next_check_date = #{nextCheckDate},</if>
+            <if test="scrapDate != null">scrap_date = #{scrapDate},</if>
+            <if test="currentStatus != null">current_status = #{currentStatus},</if>
+            <if test="emptyType != null">empty_type = #{emptyType},</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>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where bottle_id = #{bottleId}
+    </update>
+
+    <delete id="deleteTGasBottleInfoById" parameterType="Long">
+        delete from t_gas_bottle_info where bottle_id = #{bottleId}
+    </delete>
+
+    <delete id="deleteTGasBottleInfoByIds" parameterType="String">
+        delete from t_gas_bottle_info where bottle_id in 
+        <foreach item="bottleId" collection="array" open="(" separator="," close=")">
+            #{bottleId}
+        </foreach>
+    </delete>
+
+    <select id="bottleStatistics" parameterType="java.lang.Long" resultType="com.zehong.system.domain.BottleStatistics">
+        select
+          (select station_name from t_gas_storage_station_info info where info.station_id = final.station_id) as stationName,
+          sum(final.totalNum) as totalNum,
+          sum(final.normalNum) as normalNum,
+          sum(final.overNum) as overNum,
+          sum(final.junkNum) as junkNum
+        from(
+            select
+                base.station_id,
+            count(1) as totalNum,
+                case bottle_status when '1' then count(1) else 0 end as normalNum,
+                case bottle_status when '2' then count(1) else 0 end as overNum,
+                case bottle_status when '3' then count(1) else 0 end as junkNum
+            from
+                t_gas_bottle_info base
+            <where>
+                <if test="stationId != null">
+                    base.station_id = #{stationId}
+                </if>
+            </where>
+            group by
+                base.station_id,base.bottle_status
+        )final
+        group by final.station_id
+    </select>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TGasBottleTrackRecordMapper.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.TGasBottleTrackRecordMapper">
+    
+    <resultMap type="TGasBottleTrackRecord" id="TGasBottleTrackRecordResult">
+        <result property="trackRecordId"    column="track_record_id"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="bottleId"    column="bottle_id"    />
+        <result property="processesName"    column="processes_name"    />
+        <result property="processesRelationId"    column="processes_relation_id"    />
+        <result property="operateDate"    column="operate_date"    />
+        <result property="operator"    column="operator"    />
+        <result property="sender"    column="sender"    />
+        <result property="recipient"    column="recipient"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remark"    column="remark"    />
+        <result property="stationName" column="station_name"/>
+        <result property="bottleCode"    column="bottle_code"    />
+        <result property="bottleCapacity"    column="bottle_capacity"    />
+        <result property="operatorName" column="operator_name"/>
+    </resultMap>
+
+    <sql id="selectTGasBottleTrackRecordVo">
+        SELECT
+            record.track_record_id,
+            record.station_id,
+            record.bottle_id,
+            record.processes_name,
+            record.processes_relation_id,
+            record.operate_date,
+            record.operator,
+            record.sender,
+            recipient,
+            record.create_time,
+            record.update_time,
+            record.is_del,
+            record.remark,
+            station.station_name,
+            bottle.bottle_code,
+            bottle.bottle_capacity,
+            (select us.gas_user_name from t_gas_user_info us where us.gas_user_id = record.operator) as operator_name
+        FROM
+            t_gas_bottle_track_record record
+        LEFT JOIN t_gas_storage_station_info station ON station.station_id = record.station_id
+        LEFT JOIN t_gas_bottle_info bottle ON bottle.bottle_id = record.bottle_id
+    </sql>
+
+    <select id="selectTGasBottleTrackRecordList" parameterType="TGasBottleTrackRecord" resultMap="TGasBottleTrackRecordResult">
+        <include refid="selectTGasBottleTrackRecordVo"/>
+        <where>  
+            <if test="stationId != null "> and record.station_id = #{stationId}</if>
+            <if test="bottleId != null "> and record.bottle_id = #{bottleId}</if>
+            <if test="processesName != null  and processesName != ''"> and record.processes_name like concat('%', #{processesName}, '%')</if>
+            <if test="processesRelationId != null "> and record.processes_relation_id = #{processesRelationId}</if>
+            <if test="operateDate != null "> and record.operate_date = #{operateDate}</if>
+            <if test="operator != null "> and record.operator = #{operator}</if>
+            <if test="sender != null  and sender != ''"> and record.sender = #{sender}</if>
+            <if test="recipient != null  and recipient != ''"> and record.recipient = #{recipient}</if>
+            <if test="isDel != null  and isDel != ''"> and record.is_del = #{isDel}</if>
+            <if test="bottleCode != null"> and bottle.bottle_code like concat('%', #{ bottleCode }, '%')</if>
+        </where>
+        ORDER BY record.operate_date DESC
+    </select>
+    
+    <select id="selectTGasBottleTrackRecordById" parameterType="Long" resultMap="TGasBottleTrackRecordResult">
+        <include refid="selectTGasBottleTrackRecordVo"/>
+        where record.track_record_id = #{trackRecordId}
+    </select>
+        
+    <insert id="insertTGasBottleTrackRecord" parameterType="TGasBottleTrackRecord" useGeneratedKeys="true" keyProperty="trackRecordId">
+        insert into t_gas_bottle_track_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">station_id,</if>
+            <if test="bottleId != null">bottle_id,</if>
+            <if test="processesName != null">processes_name,</if>
+            <if test="processesRelationId != null">processes_relation_id,</if>
+            <if test="operateDate != null">operate_date,</if>
+            <if test="operator != null">operator,</if>
+            <if test="sender != null">sender,</if>
+            <if test="recipient != null">recipient,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">#{stationId},</if>
+            <if test="bottleId != null">#{bottleId},</if>
+            <if test="processesName != null">#{processesName},</if>
+            <if test="processesRelationId != null">#{processesRelationId},</if>
+            <if test="operateDate != null">#{operateDate},</if>
+            <if test="operator != null">#{operator},</if>
+            <if test="sender != null">#{sender},</if>
+            <if test="recipient != null">#{recipient},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTGasBottleTrackRecord" parameterType="TGasBottleTrackRecord">
+        update t_gas_bottle_track_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="bottleId != null">bottle_id = #{bottleId},</if>
+            <if test="processesName != null">processes_name = #{processesName},</if>
+            <if test="processesRelationId != null">processes_relation_id = #{processesRelationId},</if>
+            <if test="operateDate != null">operate_date = #{operateDate},</if>
+            <if test="operator != null">operator = #{operator},</if>
+            <if test="sender != null">sender = #{sender},</if>
+            <if test="recipient != null">recipient = #{recipient},</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>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where track_record_id = #{trackRecordId}
+    </update>
+
+    <delete id="deleteTGasBottleTrackRecordById" parameterType="Long">
+        delete from t_gas_bottle_track_record where track_record_id = #{trackRecordId}
+    </delete>
+
+    <delete id="deleteTGasBottleTrackRecordByIds" parameterType="String">
+        delete from t_gas_bottle_track_record where track_record_id in 
+        <foreach item="trackRecordId" collection="array" open="(" separator="," close=")">
+            #{trackRecordId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TGasStorageStationInfoMapper.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.TGasStorageStationInfoMapper">
+    
+    <resultMap type="TGasStorageStationInfo" id="TGasStorageStationInfoResult">
+        <result property="stationId"    column="station_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="stationCode"    column="station_code"    />
+        <result property="director"    column="director"    />
+        <result property="telNum"    column="tel_num"    />
+        <result property="address"    column="address"    />
+        <result property="licenceFile"    column="licence_file"    />
+        <result property="licenceCode"    column="licence_code"    />
+        <result property="licenceEffectiveDate"    column="licence_effective_date"    />
+        <result property="licenceLimitDate"    column="licence_limit_date"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTGasStorageStationInfoVo">
+        select station_id, station_name, station_code, director, tel_num, address, licence_file, licence_code, licence_effective_date, licence_limit_date, longitude, latitude, create_time, update_time, remark from t_gas_storage_station_info
+    </sql>
+
+    <select id="selectTGasStorageStationInfoList" parameterType="TGasStorageStationInfo" resultMap="TGasStorageStationInfoResult">
+        <include refid="selectTGasStorageStationInfoVo"/>
+        <where>  
+            <if test="stationName != null  and stationName != ''"> and station_name like concat('%', #{stationName}, '%')</if>
+            <if test="stationCode != null  and stationCode != ''"> and station_code = #{stationCode}</if>
+            <if test="director != null  and director != ''"> and director = #{director}</if>
+            <if test="telNum != null  and telNum != ''"> and tel_num = #{telNum}</if>
+            <if test="address != null  and address != ''"> and address = #{address}</if>
+            <if test="licenceFile != null  and licenceFile != ''"> and licence_file = #{licenceFile}</if>
+            <if test="licenceCode != null  and licenceCode != ''"> and licence_code = #{licenceCode}</if>
+            <if test="licenceEffectiveDate != null "> and licence_effective_date = #{licenceEffectiveDate}</if>
+            <if test="licenceLimitDate != null "> and licence_limit_date = #{licenceLimitDate}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="createBeginTime != null and createEndTime != null">
+                and create_time BETWEEN #{createBeginTime} AND #{createEndTime}
+            </if>
+        </where>
+    </select>
+    
+    <select id="selectTGasStorageStationInfoById" parameterType="Long" resultMap="TGasStorageStationInfoResult">
+        <include refid="selectTGasStorageStationInfoVo"/>
+        where station_id = #{stationId}
+    </select>
+        
+    <insert id="insertTGasStorageStationInfo" parameterType="TGasStorageStationInfo" useGeneratedKeys="true" keyProperty="stationId">
+        insert into t_gas_storage_station_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stationName != null">station_name,</if>
+            <if test="stationCode != null">station_code,</if>
+            <if test="director != null">director,</if>
+            <if test="telNum != null">tel_num,</if>
+            <if test="address != null">address,</if>
+            <if test="licenceFile != null">licence_file,</if>
+            <if test="licenceCode != null">licence_code,</if>
+            <if test="licenceEffectiveDate != null">licence_effective_date,</if>
+            <if test="licenceLimitDate != null">licence_limit_date,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stationName != null">#{stationName},</if>
+            <if test="stationCode != null">#{stationCode},</if>
+            <if test="director != null">#{director},</if>
+            <if test="telNum != null">#{telNum},</if>
+            <if test="address != null">#{address},</if>
+            <if test="licenceFile != null">#{licenceFile},</if>
+            <if test="licenceCode != null">#{licenceCode},</if>
+            <if test="licenceEffectiveDate != null">#{licenceEffectiveDate},</if>
+            <if test="licenceLimitDate != null">#{licenceLimitDate},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTGasStorageStationInfo" parameterType="TGasStorageStationInfo">
+        update t_gas_storage_station_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="stationCode != null">station_code = #{stationCode},</if>
+            <if test="director != null">director = #{director},</if>
+            <if test="telNum != null">tel_num = #{telNum},</if>
+            <if test="address != null">address = #{address},</if>
+            <if test="licenceFile != null">licence_file = #{licenceFile},</if>
+            <if test="licenceCode != null">licence_code = #{licenceCode},</if>
+            <if test="licenceEffectiveDate != null">licence_effective_date = #{licenceEffectiveDate},</if>
+            <if test="licenceLimitDate != null">licence_limit_date = #{licenceLimitDate},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where station_id = #{stationId}
+    </update>
+
+    <delete id="deleteTGasStorageStationInfoById" parameterType="Long">
+        delete from t_gas_storage_station_info where station_id = #{stationId}
+    </delete>
+
+    <delete id="deleteTGasStorageStationInfoByIds" parameterType="String">
+        delete from t_gas_storage_station_info where station_id in 
+        <foreach item="stationId" collection="array" open="(" separator="," close=")">
+            #{stationId}
+        </foreach>
+    </delete>
+
+    <select id="baseInfoStatistics" parameterType="java.lang.Long" resultType="com.zehong.system.domain.BaseInfoStatistics">
+        SELECT
+          station.station_name as stationName,
+          (SELECT COUNT(1) FROM t_gas_bottle_info bottle WHERE bottle.station_id = station.station_id)as totalBottle,
+          (SELECT COUNT(1) FROM t_vehicle_info vehicle WHERE vehicle.station_id = station.station_id) AS totalVehicle,
+          (SELECT COUNT(1) FROM t_practitioner_info pr WHERE pr.station_id = station.station_id) AS totalPractitioner
+        FROM
+            t_gas_storage_station_info station
+        <where>
+            <if test="stationId != null" >
+                station.station_id = #{stationId}
+            </if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TGasUserInfoMapper.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.TGasUserInfoMapper">
+    
+    <resultMap type="TGasUserInfo" id="TGasUserInfoResult">
+        <result property="gasUserId"    column="gas_user_id"    />
+        <result property="gasUserName"    column="gas_user_name"    />
+        <result property="gasUserCode"    column="gas_user_code"    />
+        <result property="gasUserType"    column="gas_user_type"    />
+        <result property="telNum"    column="tel_num"    />
+        <result property="gasUserStatus"    column="gas_user_status"    />
+        <result property="gasUserAddress"    column="gas_user_address"    />
+        <result property="lastDeliveryDate"    column="last_delivery_date"    />
+        <result property="gasUserCheckStatus"    column="gas_user_check_status"    />
+        <result property="totalCheckNum"    column="total_check_num"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTGasUserInfoVo">
+        select gas_user_id, gas_user_name, gas_user_code, gas_user_type, tel_num, gas_user_status, gas_user_address, last_delivery_date, gas_user_check_status, total_check_num, create_time, update_time, is_del, remark from t_gas_user_info
+    </sql>
+
+    <select id="selectTGasUserInfoList" parameterType="TGasUserInfo" resultMap="TGasUserInfoResult">
+        <include refid="selectTGasUserInfoVo"/>
+        <where>  
+            <if test="gasUserName != null  and gasUserName != ''"> and gas_user_name like concat('%', #{gasUserName}, '%')</if>
+            <if test="gasUserCode != null  and gasUserCode != ''"> and gas_user_code = #{gasUserCode}</if>
+            <if test="gasUserType != null  and gasUserType != ''"> and gas_user_type = #{gasUserType}</if>
+            <if test="telNum != null  and telNum != ''"> and tel_num = #{telNum}</if>
+            <if test="gasUserStatus != null  and gasUserStatus != ''"> and gas_user_status = #{gasUserStatus}</if>
+            <if test="gasUserAddress != null  and gasUserAddress != ''"> and gas_user_address = #{gasUserAddress}</if>
+            <if test="lastDeliveryDate != null "> and last_delivery_date = #{lastDeliveryDate}</if>
+            <if test="gasUserCheckStatus != null  and gasUserCheckStatus != ''"> and gas_user_check_status = #{gasUserCheckStatus}</if>
+            <if test="totalCheckNum != null "> and total_check_num = #{totalCheckNum}</if>
+            <if test="isDel != null  and isDel != ''"> and is_del = #{isDel}</if>
+        </where>
+    </select>
+    
+    <select id="selectTGasUserInfoById" parameterType="Long" resultMap="TGasUserInfoResult">
+        <include refid="selectTGasUserInfoVo"/>
+        where gas_user_id = #{gasUserId}
+    </select>
+        
+    <insert id="insertTGasUserInfo" parameterType="TGasUserInfo" useGeneratedKeys="true" keyProperty="gasUserId">
+        insert into t_gas_user_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="gasUserName != null">gas_user_name,</if>
+            <if test="gasUserCode != null">gas_user_code,</if>
+            <if test="gasUserType != null">gas_user_type,</if>
+            <if test="telNum != null">tel_num,</if>
+            <if test="gasUserStatus != null">gas_user_status,</if>
+            <if test="gasUserAddress != null">gas_user_address,</if>
+            <if test="lastDeliveryDate != null">last_delivery_date,</if>
+            <if test="gasUserCheckStatus != null">gas_user_check_status,</if>
+            <if test="totalCheckNum != null">total_check_num,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="gasUserName != null">#{gasUserName},</if>
+            <if test="gasUserCode != null">#{gasUserCode},</if>
+            <if test="gasUserType != null">#{gasUserType},</if>
+            <if test="telNum != null">#{telNum},</if>
+            <if test="gasUserStatus != null">#{gasUserStatus},</if>
+            <if test="gasUserAddress != null">#{gasUserAddress},</if>
+            <if test="lastDeliveryDate != null">#{lastDeliveryDate},</if>
+            <if test="gasUserCheckStatus != null">#{gasUserCheckStatus},</if>
+            <if test="totalCheckNum != null">#{totalCheckNum},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTGasUserInfo" parameterType="TGasUserInfo">
+        update t_gas_user_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="gasUserName != null">gas_user_name = #{gasUserName},</if>
+            <if test="gasUserCode != null">gas_user_code = #{gasUserCode},</if>
+            <if test="gasUserType != null">gas_user_type = #{gasUserType},</if>
+            <if test="telNum != null">tel_num = #{telNum},</if>
+            <if test="gasUserStatus != null">gas_user_status = #{gasUserStatus},</if>
+            <if test="gasUserAddress != null">gas_user_address = #{gasUserAddress},</if>
+            <if test="lastDeliveryDate != null">last_delivery_date = #{lastDeliveryDate},</if>
+            <if test="gasUserCheckStatus != null">gas_user_check_status = #{gasUserCheckStatus},</if>
+            <if test="totalCheckNum != null">total_check_num = #{totalCheckNum},</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>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where gas_user_id = #{gasUserId}
+    </update>
+
+    <delete id="deleteTGasUserInfoById" parameterType="Long">
+        delete from t_gas_user_info where gas_user_id = #{gasUserId}
+    </delete>
+
+    <delete id="deleteTGasUserInfoByIds" parameterType="String">
+        delete from t_gas_user_info where gas_user_id in 
+        <foreach item="gasUserId" collection="array" open="(" separator="," close=")">
+            #{gasUserId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

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

@@ -132,4 +132,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{hiddenId}
         </foreach>
     </delete>
+
+    <!--获取隐患整治台账统计信息-->
+    <select id="hazardStatistics" resultType="com.zehong.system.domain.Statistics">
+        SELECT
+        COUNT( * ) AS 'count',
+        DATE_FORMAT( create_time, '%Y-%m-%d' ) AS date
+        FROM
+        t_hidden_danger_standing_book
+        WHERE
+        is_del='0'
+        and
+        DATE_FORMAT( create_time, '%Y-%m-%d' ) IN
+        <foreach collection="list" item="sevenDate" separator="," open="(" close=")">
+            #{sevenDate}
+        </foreach>
+        GROUP BY
+        DATE_FORMAT( create_time, '%Y-%m-%d' )
+        ORDER BY
+        DATE_FORMAT( create_time, '%Y-%m-%d' ) DESC;
+    </select>
 </mapper>

gassafetyprogress-system/src/main/resources/mapper/system/TPractitionerInfoMapper.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.TPractitionerInfoMapper">
+    
+    <resultMap type="TPractitionerInfo" id="TPractitionerInfoResult">
+        <result property="practitionerId"    column="practitioner_id"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="practitionerNum"    column="practitioner_num"    />
+        <result property="name"    column="name"    />
+        <result property="sex"    column="sex"    />
+        <result property="birthDate"    column="birth_date"    />
+        <result property="postId"    column="post_id"    />
+        <result property="telNum"    column="tel_num"    />
+        <result property="deliveryArea"    column="delivery_area"    />
+        <result property="personPhoto"    column="person_photo"    />
+        <result property="licenseFile"    column="license_file"    />
+        <result property="certificateNum"    column="certificate_num"    />
+        <result property="certificateEffectiveDate"    column="certificate_effective_date"    />
+        <result property="password"    column="password"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remark"    column="remark"    />
+        <result property="stationName" column="station_name"/>
+        <result property="postName" column="post_name"/>
+    </resultMap>
+
+    <sql id="selectTPractitionerInfoVo">
+        SELECT
+            info.practitioner_id,
+            info.station_id,
+            info.practitioner_num,
+            info.NAME,
+            info.sex,
+            info.birth_date,
+            info.post_id,
+            info.tel_num,
+            info.delivery_area,
+            info.person_photo,
+            info.license_file,
+            info.certificate_num,
+            info.certificate_effective_date,
+            info.PASSWORD,
+            info.create_time,
+            info.update_time,
+            info.is_del,
+            info.remark,
+          (SELECT station_name FROM t_gas_storage_station_info station WHERE station.station_id = info.station_id) AS station_name,
+          (SELECT post_name FROM sys_post p WHERE p.post_id = info.post_id) AS post_name
+        FROM
+            t_practitioner_info info
+    </sql>
+
+    <select id="selectTPractitionerInfoList" parameterType="TPractitionerInfo" resultMap="TPractitionerInfoResult">
+        <include refid="selectTPractitionerInfoVo"/>
+        <where>  
+            <if test="stationId != null "> and info.station_id = #{stationId}</if>
+            <if test="practitionerNum != null  and practitionerNum != ''"> and info.practitioner_num = #{practitionerNum}</if>
+            <if test="name != null  and name != ''"> and info.name like concat('%', #{name}, '%')</if>
+            <if test="sex != null  and sex != ''"> and info.sex = #{sex}</if>
+            <if test="birthDate != null "> and info.birth_date = #{birthDate}</if>
+            <if test="postId != null "> and info.post_id = #{postId}</if>
+            <if test="telNum != null  and telNum != ''"> and info.tel_num = #{telNum}</if>
+            <if test="deliveryArea != null  and deliveryArea != ''"> and info.delivery_area = #{deliveryArea}</if>
+            <if test="personPhoto != null  and personPhoto != ''"> and info.info.person_photo = #{personPhoto}</if>
+            <if test="licenseFile != null  and licenseFile != ''"> and info.license_file = #{licenseFile}</if>
+            <if test="certificateNum != null  and certificateNum != ''"> and info.certificate_num = #{certificateNum}</if>
+            <if test="certificateEffectiveDate != null "> and info.certificate_effective_date = #{certificateEffectiveDate}</if>
+            <if test="password != null  and password != ''"> and info.password = #{password}</if>
+            <if test="isDel != null  and isDel != ''"> and info.is_del = #{isDel}</if>
+        </where>
+    </select>
+    
+    <select id="selectTPractitionerInfoById" parameterType="Long" resultMap="TPractitionerInfoResult">
+        <include refid="selectTPractitionerInfoVo"/>
+        where info.practitioner_id = #{practitionerId}
+    </select>
+        
+    <insert id="insertTPractitionerInfo" parameterType="TPractitionerInfo" useGeneratedKeys="true" keyProperty="practitionerId">
+        insert into t_practitioner_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">station_id,</if>
+            <if test="practitionerNum != null">practitioner_num,</if>
+            <if test="name != null">name,</if>
+            <if test="sex != null">sex,</if>
+            <if test="birthDate != null">birth_date,</if>
+            <if test="postId != null">post_id,</if>
+            <if test="telNum != null">tel_num,</if>
+            <if test="deliveryArea != null">delivery_area,</if>
+            <if test="personPhoto != null">person_photo,</if>
+            <if test="licenseFile != null">license_file,</if>
+            <if test="certificateNum != null">certificate_num,</if>
+            <if test="certificateEffectiveDate != null">certificate_effective_date,</if>
+            <if test="password != null">password,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">#{stationId},</if>
+            <if test="practitionerNum != null">#{practitionerNum},</if>
+            <if test="name != null">#{name},</if>
+            <if test="sex != null">#{sex},</if>
+            <if test="birthDate != null">#{birthDate},</if>
+            <if test="postId != null">#{postId},</if>
+            <if test="telNum != null">#{telNum},</if>
+            <if test="deliveryArea != null">#{deliveryArea},</if>
+            <if test="personPhoto != null">#{personPhoto},</if>
+            <if test="licenseFile != null">#{licenseFile},</if>
+            <if test="certificateNum != null">#{certificateNum},</if>
+            <if test="certificateEffectiveDate != null">#{certificateEffectiveDate},</if>
+            <if test="password != null">#{password},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTPractitionerInfo" parameterType="TPractitionerInfo">
+        update t_practitioner_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="practitionerNum != null">practitioner_num = #{practitionerNum},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="sex != null">sex = #{sex},</if>
+            <if test="birthDate != null">birth_date = #{birthDate},</if>
+            <if test="postId != null">post_id = #{postId},</if>
+            <if test="telNum != null">tel_num = #{telNum},</if>
+            <if test="deliveryArea != null">delivery_area = #{deliveryArea},</if>
+            <if test="personPhoto != null">person_photo = #{personPhoto},</if>
+            <if test="licenseFile != null">license_file = #{licenseFile},</if>
+            <if test="certificateNum != null">certificate_num = #{certificateNum},</if>
+            <if test="certificateEffectiveDate != null">certificate_effective_date = #{certificateEffectiveDate},</if>
+            <if test="password != null">password = #{password},</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>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where practitioner_id = #{practitionerId}
+    </update>
+
+    <delete id="deleteTPractitionerInfoById" parameterType="Long">
+        delete from t_practitioner_info where practitioner_id = #{practitionerId}
+    </delete>
+
+    <delete id="deleteTPractitionerInfoByIds" parameterType="String">
+        delete from t_practitioner_info where practitioner_id in 
+        <foreach item="practitionerId" collection="array" open="(" separator="," close=")">
+            #{practitionerId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafetyprogress-system/src/main/resources/mapper/system/TSafeCheckRecordMapper.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.TSafeCheckRecordMapper">
+    
+    <resultMap type="TSafeCheckRecord" id="TSafeCheckRecordResult">
+        <result property="safeCheckId"    column="safe_check_id"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="gasUserId"    column="gas_user_id"    />
+        <result property="safeCheckDate"    column="safe_check_date"    />
+        <result property="safeCheckPerson"    column="safe_check_person"    />
+        <result property="bottleNum"    column="bottle_num"    />
+        <result property="checkInStatus"    column="check_in_status"    />
+        <result property="stoveCheckStatus"    column="stove_check_status"    />
+        <result property="stoveCheckPic"    column="stove_check_pic"    />
+        <result property="hoseCheckStatus"    column="hose_check_status"    />
+        <result property="hoseCheckPic"    column="hose_check_pic"    />
+        <result property="valveCheckStatus"    column="valve_check_status"    />
+        <result property="valveCheckPic"    column="valve_check_pic"    />
+        <result property="bottleCheckStatus"    column="bottle_check_status"    />
+        <result property="bottleCheckPic"    column="bottle_check_pic"    />
+        <result property="alarmCheckStatus"    column="alarm_check_status"    />
+        <result property="alarmCheckPic"    column="alarm_check_pic"    />
+        <result property="placeCheckStatus"    column="place_check_status"    />
+        <result property="placeCheckPic"    column="place_check_pic"    />
+        <result property="checkPersonSign"    column="check_person_sign"    />
+        <result property="gasUserSign"    column="gas_user_sign"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remark"    column="remark"    />
+        <result property="stationName" column="station_name"/>
+        <result property="gasUserName" column="gas_user_name"/>
+        <result property="gasUserType" column="gas_user_type"/>
+        <result property="telNum" column="tel_num"/>
+        <result property="gasUserAddress" column="gas_user_address"/>
+        <result property="safeCheckPersonName" column="safe_check_person_name"/>
+    </resultMap>
+
+    <sql id="selectTSafeCheckRecordVo">
+        SELECT
+            record.safe_check_id,
+            record.station_id,
+            record.gas_user_id,
+            record.safe_check_date,
+            record.safe_check_person,
+            record.bottle_num,
+            record.check_in_status,
+            record.stove_check_status,
+            record.stove_check_pic,
+            record.hose_check_status,
+            record.hose_check_pic,
+            record.valve_check_status,
+            record.valve_check_pic,
+            record.bottle_check_status,
+            record.bottle_check_pic,
+            record.alarm_check_status,
+            record.alarm_check_pic,
+            record.place_check_status,
+            record.place_check_pic,
+            record.check_person_sign,
+            record.gas_user_sign,
+            record.create_time,
+            record.update_time,
+            record.is_del,
+            record.remark,
+            station.station_name,
+            us.gas_user_name,
+            us.gas_user_type,
+            us.tel_num,
+            us.gas_user_address,
+            p.name as safe_check_person_name
+        FROM
+            t_safe_check_record record
+        LEFT JOIN t_gas_storage_station_info station ON station.station_id = record.station_id
+        LEFT JOIN t_gas_user_info us ON us.gas_user_id = record.gas_user_id
+        LEFT JOIN t_practitioner_info p ON p.practitioner_id = record.safe_check_person
+    </sql>
+
+    <select id="selectTSafeCheckRecordList" parameterType="TSafeCheckRecord" resultMap="TSafeCheckRecordResult">
+        <include refid="selectTSafeCheckRecordVo"/>
+        <where>  
+            <if test="stationId != null "> and record.station_id = #{stationId}</if>
+            <if test="gasUserId != null "> and record.gas_user_id = #{gasUserId}</if>
+            <if test="safeCheckDate != null "> and record.safe_check_date = #{safeCheckDate}</if>
+            <if test="safeCheckPerson != null "> and record.safe_check_person = #{safeCheckPerson}</if>
+            <if test="bottleNum != null "> and record.bottle_num = #{bottleNum}</if>
+            <if test="checkInStatus != null  and checkInStatus != ''"> and record.check_in_status = #{checkInStatus}</if>
+            <if test="stoveCheckStatus != null  and stoveCheckStatus != ''"> and record.stove_check_status = #{stoveCheckStatus}</if>
+            <if test="stoveCheckPic != null  and stoveCheckPic != ''"> and record.stove_check_pic = #{stoveCheckPic}</if>
+            <if test="hoseCheckStatus != null  and hoseCheckStatus != ''"> and record.hose_check_status = #{hoseCheckStatus}</if>
+            <if test="hoseCheckPic != null  and hoseCheckPic != ''"> and record.hose_check_pic = #{hoseCheckPic}</if>
+            <if test="valveCheckStatus != null  and valveCheckStatus != ''"> and record.valve_check_status = #{valveCheckStatus}</if>
+            <if test="valveCheckPic != null  and valveCheckPic != ''"> and record.valve_check_pic = #{valveCheckPic}</if>
+            <if test="bottleCheckStatus != null  and bottleCheckStatus != ''"> and record.bottle_check_status = #{bottleCheckStatus}</if>
+            <if test="bottleCheckPic != null  and bottleCheckPic != ''"> and record.bottle_check_pic = #{bottleCheckPic}</if>
+            <if test="alarmCheckStatus != null  and alarmCheckStatus != ''"> and record.alarm_check_status = #{alarmCheckStatus}</if>
+            <if test="alarmCheckPic != null  and alarmCheckPic != ''"> and record.alarm_check_pic = #{alarmCheckPic}</if>
+            <if test="placeCheckStatus != null  and placeCheckStatus != ''"> and record.place_check_status = #{placeCheckStatus}</if>
+            <if test="placeCheckPic != null  and placeCheckPic != ''"> and record.place_check_pic = #{placeCheckPic}</if>
+            <if test="checkPersonSign != null  and checkPersonSign != ''"> and record.check_person_sign = #{checkPersonSign}</if>
+            <if test="gasUserSign != null  and gasUserSign != ''"> and record.gas_user_sign = #{gasUserSign}</if>
+            <if test="isDel != null  and isDel != ''"> and record.is_del = #{isDel}</if>
+            <if test="gasUserType != null and gasUserType != ''"> and us.gas_user_type = #{gasUserType}</if>
+            <if test="safeCheckBeginTime != null and safeCheckEndTime != null">and record.safe_check_date between #{safeCheckBeginTime} and #{safeCheckEndTime} </if>
+        </where>
+    </select>
+    
+    <select id="selectTSafeCheckRecordById" parameterType="Long" resultMap="TSafeCheckRecordResult">
+        <include refid="selectTSafeCheckRecordVo"/>
+        where record.safe_check_id = #{safeCheckId}
+    </select>
+        
+    <insert id="insertTSafeCheckRecord" parameterType="TSafeCheckRecord" useGeneratedKeys="true" keyProperty="safeCheckId">
+        insert into t_safe_check_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">station_id,</if>
+            <if test="gasUserId != null">gas_user_id,</if>
+            <if test="safeCheckDate != null">safe_check_date,</if>
+            <if test="safeCheckPerson != null">safe_check_person,</if>
+            <if test="bottleNum != null">bottle_num,</if>
+            <if test="checkInStatus != null">check_in_status,</if>
+            <if test="stoveCheckStatus != null">stove_check_status,</if>
+            <if test="stoveCheckPic != null">stove_check_pic,</if>
+            <if test="hoseCheckStatus != null">hose_check_status,</if>
+            <if test="hoseCheckPic != null">hose_check_pic,</if>
+            <if test="valveCheckStatus != null">valve_check_status,</if>
+            <if test="valveCheckPic != null">valve_check_pic,</if>
+            <if test="bottleCheckStatus != null">bottle_check_status,</if>
+            <if test="bottleCheckPic != null">bottle_check_pic,</if>
+            <if test="alarmCheckStatus != null">alarm_check_status,</if>
+            <if test="alarmCheckPic != null">alarm_check_pic,</if>
+            <if test="placeCheckStatus != null">place_check_status,</if>
+            <if test="placeCheckPic != null">place_check_pic,</if>
+            <if test="checkPersonSign != null">check_person_sign,</if>
+            <if test="gasUserSign != null">gas_user_sign,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">#{stationId},</if>
+            <if test="gasUserId != null">#{gasUserId},</if>
+            <if test="safeCheckDate != null">#{safeCheckDate},</if>
+            <if test="safeCheckPerson != null">#{safeCheckPerson},</if>
+            <if test="bottleNum != null">#{bottleNum},</if>
+            <if test="checkInStatus != null">#{checkInStatus},</if>
+            <if test="stoveCheckStatus != null">#{stoveCheckStatus},</if>
+            <if test="stoveCheckPic != null">#{stoveCheckPic},</if>
+            <if test="hoseCheckStatus != null">#{hoseCheckStatus},</if>
+            <if test="hoseCheckPic != null">#{hoseCheckPic},</if>
+            <if test="valveCheckStatus != null">#{valveCheckStatus},</if>
+            <if test="valveCheckPic != null">#{valveCheckPic},</if>
+            <if test="bottleCheckStatus != null">#{bottleCheckStatus},</if>
+            <if test="bottleCheckPic != null">#{bottleCheckPic},</if>
+            <if test="alarmCheckStatus != null">#{alarmCheckStatus},</if>
+            <if test="alarmCheckPic != null">#{alarmCheckPic},</if>
+            <if test="placeCheckStatus != null">#{placeCheckStatus},</if>
+            <if test="placeCheckPic != null">#{placeCheckPic},</if>
+            <if test="checkPersonSign != null">#{checkPersonSign},</if>
+            <if test="gasUserSign != null">#{gasUserSign},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTSafeCheckRecord" parameterType="TSafeCheckRecord">
+        update t_safe_check_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="gasUserId != null">gas_user_id = #{gasUserId},</if>
+            <if test="safeCheckDate != null">safe_check_date = #{safeCheckDate},</if>
+            <if test="safeCheckPerson != null">safe_check_person = #{safeCheckPerson},</if>
+            <if test="bottleNum != null">bottle_num = #{bottleNum},</if>
+            <if test="checkInStatus != null">check_in_status = #{checkInStatus},</if>
+            <if test="stoveCheckStatus != null">stove_check_status = #{stoveCheckStatus},</if>
+            <if test="stoveCheckPic != null">stove_check_pic = #{stoveCheckPic},</if>
+            <if test="hoseCheckStatus != null">hose_check_status = #{hoseCheckStatus},</if>
+            <if test="hoseCheckPic != null">hose_check_pic = #{hoseCheckPic},</if>
+            <if test="valveCheckStatus != null">valve_check_status = #{valveCheckStatus},</if>
+            <if test="valveCheckPic != null">valve_check_pic = #{valveCheckPic},</if>
+            <if test="bottleCheckStatus != null">bottle_check_status = #{bottleCheckStatus},</if>
+            <if test="bottleCheckPic != null">bottle_check_pic = #{bottleCheckPic},</if>
+            <if test="alarmCheckStatus != null">alarm_check_status = #{alarmCheckStatus},</if>
+            <if test="alarmCheckPic != null">alarm_check_pic = #{alarmCheckPic},</if>
+            <if test="placeCheckStatus != null">place_check_status = #{placeCheckStatus},</if>
+            <if test="placeCheckPic != null">place_check_pic = #{placeCheckPic},</if>
+            <if test="checkPersonSign != null">check_person_sign = #{checkPersonSign},</if>
+            <if test="gasUserSign != null">gas_user_sign = #{gasUserSign},</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>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where safe_check_id = #{safeCheckId}
+    </update>
+
+    <delete id="deleteTSafeCheckRecordById" parameterType="Long">
+        delete from t_safe_check_record where safe_check_id = #{safeCheckId}
+    </delete>
+
+    <delete id="deleteTSafeCheckRecordByIds" parameterType="String">
+        delete from t_safe_check_record where safe_check_id in 
+        <foreach item="safeCheckId" collection="array" open="(" separator="," close=")">
+            #{safeCheckId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

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

@@ -148,4 +148,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{troubleId}
         </foreach>
     </delete>
+
+
+    <!--查询统计信息-->
+    <select id="accidentLedger" resultType="com.zehong.system.domain.Statistics">
+       SELECT
+       COUNT( * ) AS 'count',
+       DATE_FORMAT( create_time, '%Y-%m-%d' ) AS date
+       FROM
+        t_trouble_standing_book
+       WHERE
+        is_del='0'
+        and
+       DATE_FORMAT( create_time, '%Y-%m-%d' ) IN
+       <foreach collection="list" item="sevenDate" separator="," open="(" close=")">
+            #{sevenDate}
+       </foreach>
+       GROUP BY
+       DATE_FORMAT( create_time, '%Y-%m-%d' )
+       ORDER BY
+       DATE_FORMAT( create_time, '%Y-%m-%d' ) DESC;
+    </select>
 </mapper>

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

@@ -18,6 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="phone"    column="phone"    />
         <result property="isDel"    column="is_del"    />
         <result property="remarks"    column="remarks"    />
+        <result property="beyondEnterpriseName"    column="enterprise_name"    />
+        <result property="siteStationName"    column="site_station_name"    />
     </resultMap>
 
     <sql id="selectTVehicleInfoVo">
@@ -25,25 +27,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectTVehicleInfoList" parameterType="TVehicleInfo" resultMap="TVehicleInfoResult">
-        <include refid="selectTVehicleInfoVo"/>
+        select a.*,b.enterprise_name,c.site_station_name
+        from t_vehicle_info a
+        left join t_enterprise_info b on a.beyond_enterprise_id=b.enterprise_id
+        left join t_site_station_info c on c.site_station_id=a.station_id
         <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>
+            <if test="brandModel != null  and brandModel != ''"> and a.brand_model = #{brandModel}</if>
+            <if test="vehicleType != null  and vehicleType != ''"> and a.vehicle_type = #{vehicleType}</if>
+            <if test="vehicleLoad != null  and vehicleLoad != ''"> and a.vehicle_load = #{vehicleLoad}</if>
+            <if test="vehicleSize != null  and vehicleSize != ''"> and a.vehicle_size = #{vehicleSize}</if>
+            <if test="vehicleLimt != null  and vehicleLimt != ''"> and a.vehicle_limt = #{vehicleLimt}</if>
+            <if test="vehicleInspect != null  and vehicleInspect != ''"> and a.vehicle_inspect = #{vehicleInspect}</if>
+            <if test="beyondEnterpriseId != null  and beyondEnterpriseId != ''"> and a.beyond_enterprise_id = #{beyondEnterpriseId}</if>
+            <if test="personLiable != null  and personLiable != ''"> and a.person_liable = #{personLiable}</if>
+            <if test="phone != null  and phone != ''"> and a.phone = #{phone}</if>
+            <if test="isDel != null  and isDel != ''"> and a.is_del = #{isDel}</if>
+            <if test="remarks != null  and remarks != ''"> and a.remarks = #{remarks}</if>
         </where>
+        order by a.vehicle_id desc
     </select>
 
     <select id="selectTVehicleInfoById" parameterType="Long" resultMap="TVehicleInfoResult">
-        <include refid="selectTVehicleInfoVo"/>
+           select a.*,b.enterprise_name
+        from t_vehicle_info a left join t_enterprise_info b on a.beyond_enterprise_id=b.enterprise_id
         where vehicle_id = #{vehicleId}
     </select>
 

gassafetyprogress-system/src/main/resources/mapper/system/TVehicleUseRecordMapper.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.TVehicleUseRecordMapper">
+
+    <resultMap type="TVehicleUseRecord" id="TVehicleUseRecordResult">
+        <result property="vehicleUseRecordId"    column="vehicle_use_record_id"    />
+        <result property="stationId"    column="station_id"    />
+        <result property="vehicleId"    column="vehicle_id"    />
+        <result property="vehicleUserId"    column="vehicle_user_id"    />
+        <result property="vehicleUseDate"    column="vehicle_use_date"    />
+        <result property="vehicleReturnDate"    column="vehicle_return_date"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remark"    column="remark"    />
+        <result property="carNum"    column="car_num"    />
+        <result property="siteStationName"    column="station_name"    />
+        <result property="name"    column="nick_name"    />
+        <result property="vehicleCode"    column="vehicle_code"    />
+
+    </resultMap>
+
+    <sql id="selectTVehicleUseRecordVo">
+        select vehicle_use_record_id, station_id, vehicle_id, vehicle_user_id, vehicle_use_date, vehicle_return_date, create_time, update_time, is_del, remark from t_vehicle_use_record
+    </sql>
+
+    <select id="selectTVehicleUseRecordList" parameterType="TVehicleUseRecord" resultMap="TVehicleUseRecordResult">
+        select a.vehicle_use_record_id, a.station_id, a.vehicle_id, a.vehicle_user_id, a.vehicle_use_date, a.vehicle_return_date, a.create_time, a.update_time, a.is_del, a.remark,
+        b.station_name,c.vehicle_code,c.car_num,d.nick_name
+        from t_vehicle_use_record a
+        left join t_gas_storage_station_info b on  a.station_id=b.station_id
+        left join t_vehicle_info  c  on a.vehicle_id=c.vehicle_id
+        left join sys_user d on a.vehicle_user_id=d.user_id
+        <where>
+            <if test="stationId != null "> and a.station_id = #{stationId}</if>
+            <if test="vehicleId != null "> and a.vehicle_id = #{vehicleId}</if>
+            <if test="vehicleUserId != null "> and a.vehicle_user_id = #{vehicleUserId}</if>
+            <if test="vehicleUseDate != null "> and a.vehicle_use_date = #{vehicleUseDate}</if>
+            <if test="vehicleReturnDate != null "> and a.vehicle_return_date = #{vehicleReturnDate}</if>
+            <if test="isDel != null  and isDel != ''"> and a.is_del = #{isDel}</if>
+        </where>
+        order by a.vehicle_use_record_id desc
+    </select>
+
+    <select id="selectTVehicleUseRecordById" parameterType="Long" resultMap="TVehicleUseRecordResult">
+        <include refid="selectTVehicleUseRecordVo"/>
+        where vehicle_use_record_id = #{vehicleUseRecordId}
+    </select>
+
+    <insert id="insertTVehicleUseRecord" parameterType="TVehicleUseRecord" useGeneratedKeys="true" keyProperty="vehicleUseRecordId">
+        insert into t_vehicle_use_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">station_id,</if>
+            <if test="vehicleId != null">vehicle_id,</if>
+            <if test="vehicleUserId != null">vehicle_user_id,</if>
+            <if test="vehicleUseDate != null">vehicle_use_date,</if>
+            <if test="vehicleReturnDate != null">vehicle_return_date,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stationId != null">#{stationId},</if>
+            <if test="vehicleId != null">#{vehicleId},</if>
+            <if test="vehicleUserId != null">#{vehicleUserId},</if>
+            <if test="vehicleUseDate != null">#{vehicleUseDate},</if>
+            <if test="vehicleReturnDate != null">#{vehicleReturnDate},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTVehicleUseRecord" parameterType="TVehicleUseRecord">
+        update t_vehicle_use_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stationId != null">station_id = #{stationId},</if>
+            <if test="vehicleId != null">vehicle_id = #{vehicleId},</if>
+            <if test="vehicleUserId != null">vehicle_user_id = #{vehicleUserId},</if>
+            <if test="vehicleUseDate != null">vehicle_use_date = #{vehicleUseDate},</if>
+            <if test="vehicleReturnDate != null">vehicle_return_date = #{vehicleReturnDate},</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>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where vehicle_use_record_id = #{vehicleUseRecordId}
+    </update>
+
+    <delete id="deleteTVehicleUseRecordById" parameterType="Long">
+        delete from t_vehicle_use_record where vehicle_use_record_id = #{vehicleUseRecordId}
+    </delete>
+
+    <delete id="deleteTVehicleUseRecordByIds" parameterType="String">
+        delete from t_vehicle_use_record where vehicle_use_record_id in
+        <foreach item="vehicleUseRecordId" collection="array" open="(" separator="," close=")">
+            #{vehicleUseRecordId}
+        </foreach>
+    </delete>
+</mapper>

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

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

gassafetyprogress-web/src/views/regulation/pipe/index.vue

@@ -339,25 +339,25 @@ export default {
           { required: true, message: "请输入管道长度", trigger: "blur" },
           // { min: 0, max: 10, message: "长度10位", trigger: "blur" },
         ],
-        pipeDiameter: [
-          { required: true, message: "请输入管径", trigger: "blur" },
-          // { min: 0, max: 15, message: "长度15位", trigger: "blur" },
-        ],
-        pipePressure: [
-          { required: true, message: "请输入压力", trigger: "blur" },
-          // { min: 0, max: 10, message: "长度10位", trigger: "blur" },
-        ],
-        buildDate: [
-          { required: true, message: "请选择建设年代", trigger: "blur" },
-        ],
-        pipeMaterial: [
-          { required: true, message: "请输入材质", trigger: "blur" },
-          // { min: 0, max: 10, message: "长度10位", trigger: "blur" },
-        ],
-        buriedDepth:[
-          { required: true, message: "请输入埋深", trigger: "blur" },
-          // { min: 0, max: 10, message: "长度10位", trigger: "blur" },
-        ],
+        // pipeDiameter: [
+        //   { required: true, message: "请输入管径", trigger: "blur" },
+        //   // { min: 0, max: 15, message: "长度15位", trigger: "blur" },
+        // ],
+        // pipePressure: [
+        //   { required: true, message: "请输入压力", trigger: "blur" },
+        //   // { min: 0, max: 10, message: "长度10位", trigger: "blur" },
+        // ],
+        // buildDate: [
+        //   { required: true, message: "请选择建设年代", trigger: "blur" },
+        // ],
+        // pipeMaterial: [
+        //   { required: true, message: "请输入材质", trigger: "blur" },
+        //   // { min: 0, max: 10, message: "长度10位", trigger: "blur" },
+        // ],
+        // buriedDepth:[
+        //   { required: true, message: "请输入埋深", trigger: "blur" },
+        //   // { min: 0, max: 10, message: "长度10位", trigger: "blur" },
+        // ],
       }
     };
   },

gassafetyprogress-web/src/views/system/license/index.vue

+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="车牌号" prop="carNum">
+        <el-input
+          v-model="queryParams.carNum"
+          placeholder="请输入车牌号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="责任人" prop="personLiable">
+        <el-input
+          v-model="queryParams.personLiable"
+          placeholder="请输入责任人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入联系电话"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:info:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:info:remove']"
+        >删除</el-button>
+      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--		  :loading="exportLoading"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['system:info:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="车辆id" align="center" prop="vehicleId" />-->
+      <el-table-column label="储配站" align="center" prop="siteStationName">
+        <template slot-scope="scope">
+          <span v-if="scope.row.siteStationName!=null">{{scope.row.siteStationName}}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="所属企业" align="center" prop="beyondEnterpriseName" />
+      <el-table-column label="车牌号" align="center" prop="carNum">
+        <template slot-scope="scope">
+          <span v-if="scope.row.carNum!=null">{{scope.row.carNum}}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="品牌型号" align="center" prop="brandModel">
+        <template slot-scope="scope">
+          <span v-if="scope.row.brandModel!=null">{{scope.row.brandModel}}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="车辆类型" align="center" prop="vehicleType">
+        <template slot-scope="scope">
+          <span v-if="scope.row.vehicleType == 1">罐车</span>
+          <span v-if="scope.row.vehicleType == 2">卡车</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="车辆载重" align="center" prop="vehicleLoad">
+        <template slot-scope="scope">
+          <span v-if="scope.row.vehicleLoad!=null">{{scope.row.vehicleLoad}}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="车辆大小" align="center" prop="vehicleSize">
+        <template slot-scope="scope">
+          <span v-if="scope.row.vehicleSize!=null">{{scope.row.vehicleSize}}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="车辆限乘" align="center" prop="vehicleLimt">
+        <template slot-scope="scope">
+          <span v-if="scope.row.vehicleLimt!=null">{{scope.row.vehicleLimt}}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="车辆检测信息" align="center" prop="vehicleInspect">
+        <template slot-scope="scope">
+          <span v-if="scope.row.vehicleInspect!=null">{{scope.row.vehicleInspect}}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="责任人" align="center" prop="personLiable">
+        <template slot-scope="scope">
+          <span v-if="scope.row.personLiable!=null">{{scope.row.personLiable}}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="经度" align="center" prop="longitude">
+        <template slot-scope="scope">
+          <span v-if="scope.row.longitude!=null">{{scope.row.longitude}}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="经度" align="center" prop="latitude">
+        <template slot-scope="scope">
+          <span v-if="scope.row.latitude!=null">{{scope.row.latitude}}</span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="联系电话" align="center" prop="phone" />
+      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:info:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:info:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改燃气车辆信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+
+        <el-row>
+          <el-col :span="11">
+        <el-form-item label="车牌号" prop="carNum">
+          <el-input v-model="form.carNum" placeholder="请输入车牌号" />
+        </el-form-item>
+          </el-col>
+
+          <el-col :span="11">
+        <el-form-item label="品牌型号" prop="brandModel">
+          <el-input v-model="form.brandModel" placeholder="请输入品牌型号" />
+        </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="车辆类型"  prop="vehicleType">
+              <el-select v-model="form.vehicleType" placeholder="请选择车辆类型" style="width: 100%;">
+                <el-option label="罐车" value="1" />
+                <el-option label="卡车" value="2" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="11">
+        <el-form-item label="车辆载重" prop="vehicleLoad">
+          <el-input v-model="form.vehicleLoad" placeholder="请输入车辆载重" />
+        </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="11">
+        <el-form-item label="车辆大小" prop="vehicleSize">
+          <el-input v-model="form.vehicleSize" placeholder="请输入车辆大小" />
+        </el-form-item>
+          </el-col>
+
+          <el-col :span="11">
+        <el-form-item label="车辆限乘" prop="vehicleLimt">
+          <el-input v-model="form.vehicleLimt" placeholder="请输入车辆限乘" />
+        </el-form-item>
+          </el-col>
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="11">
+        <el-form-item label="车辆检测信息" prop="vehicleInspect">
+          <el-input v-model="form.vehicleInspect" placeholder="请输入车辆检测信息" />
+        </el-form-item>
+          </el-col>
+          <el-col :span="11">
+<!--            -->
+<!--        <el-form-item label="所属企业" prop="beyondEnterpriseId">-->
+<!--          <el-input v-model="form.beyondEnterpriseId" placeholder="请输入所属企业" />-->
+<!--        </el-form-item>-->
+            <el-form-item label="所属企业" prop="beyondEnterpriseId">
+              <el-select v-model="form.beyondEnterpriseId" placeholder="请选择所属企业"   >
+                <el-option
+                  v-for = "dict in enterpriseList"
+                  :key = "dict.enterpriseId"
+                  :label = "dict.enterpriseName"
+                  :value = "dict.enterpriseId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="11">
+        <el-form-item label="责任人" prop="personLiable">
+          <el-input v-model="form.personLiable" placeholder="请输入责任人" />
+        </el-form-item>
+          </el-col>
+          <el-col :span="11">
+        <el-form-item label="联系电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入联系电话" />
+        </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="22">
+        <el-form-item label="备注" prop="remarks">
+          <el-input type="textarea" v-model="form.remarks" placeholder="请输入备注" />
+        </el-form-item>
+          </el-col>
+        </el-row>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/system/license";
+import {enterpriseList} from "@/api/system/eventInfo";
+export default {
+  name: "Info",
+  components: {
+  },
+  data() {
+    return {
+      enterpriseList:[],
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 燃气车辆信息表格数据
+      infoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        carNum: null,
+        brandModel: null,
+        vehicleType: null,
+        vehicleLoad: null,
+        vehicleSize: null,
+        vehicleLimt: null,
+        vehicleInspect: null,
+        beyondEnterpriseId: null,
+        personLiable: null,
+        phone: null,
+        isDel: null,
+        remarks: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    qiyechang(value){
+      let obj = {};
+      obj = this.enterpriseList.find((item)=>{
+        return item.enterpriseId === value;
+        ``});
+      this.form.beyondEnterpriseName = obj.enterpriseName;
+      this.form.beyondEnterpriseId = value;
+    },
+    /** 查询燃气车辆信息列表 */
+    getList() {
+      this.loading = true;
+      listInfo(this.queryParams).then(response => {
+        this.infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        vehicleId: null,
+        carNum: null,
+        brandModel: null,
+        vehicleType: null,
+        vehicleLoad: null,
+        vehicleSize: null,
+        vehicleLimt: null,
+        vehicleInspect: null,
+        beyondEnterpriseId: null,
+        personLiable: null,
+        phone: null,
+        isDel: null,
+        remarks: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.vehicleId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加燃气车辆信息";
+      enterpriseList(this.queryParams).then(response => {
+        this.enterpriseList = response.data;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const vehicleId = row.vehicleId || this.ids
+      enterpriseList(this.queryParams).then(response => {
+        this.enterpriseList = response.data;
+      });
+      getInfo(vehicleId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改燃气车辆信息";
+      });
+
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.vehicleId != null) {
+            updateInfo(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addInfo(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const vehicleIds = row.vehicleId || this.ids;
+      this.$confirm('是否确认删除此数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delInfo(vehicleIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有燃气车辆信息数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportInfo(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>