Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

gassafety-admin/src/main/java/com/zehong/web/controller/common/CommonController.java

@@ -74,8 +74,10 @@ public class CommonController
             // 上传文件路径
             String filePath = GasSafetyConfig.getUploadPath();
             // 上传并返回新文件名称
-            String fileName = FileUploadUtils.upload(filePath, file);
-            String url = serverConfig.getUrl() + fileName;
+//            String fileName = FileUploadUtils.upload(filePath, file);
+//            String url = serverConfig.getUrl() + fileName;
+            String fileName = file.getOriginalFilename();
+            String url = serverConfig.getUrl() + FileUploadUtils.upload(filePath, file);
             AjaxResult ajax = AjaxResult.success();
             ajax.put("fileName", fileName);
             ajax.put("url", url);

gassafety-admin/src/main/java/com/zehong/web/controller/system/TFlowmeterController.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.TFlowmeter;
+import com.zehong.system.service.ITFlowmeterService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 流量计Controller
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+@RestController
+@RequestMapping("/system/flowmeter")
+public class TFlowmeterController extends BaseController
+{
+    @Autowired
+    private ITFlowmeterService tFlowmeterService;
+
+    /**
+     * 查询流量计列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:flowmeter:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TFlowmeter tFlowmeter)
+    {
+        startPage();
+        List<TFlowmeter> list = tFlowmeterService.selectTFlowmeterList(tFlowmeter);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出流量计列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:flowmeter:export')")
+    @Log(title = "流量计", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TFlowmeter tFlowmeter)
+    {
+        List<TFlowmeter> list = tFlowmeterService.selectTFlowmeterList(tFlowmeter);
+        ExcelUtil<TFlowmeter> util = new ExcelUtil<TFlowmeter>(TFlowmeter.class);
+        return util.exportExcel(list, "流量计数据");
+    }
+
+    /**
+     * 获取流量计详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:flowmeter:query')")
+    @GetMapping(value = "/{flowmeterId}")
+    public AjaxResult getInfo(@PathVariable("flowmeterId") Long flowmeterId)
+    {
+        return AjaxResult.success(tFlowmeterService.selectTFlowmeterById(flowmeterId));
+    }
+
+    /**
+     * 新增流量计
+     */
+    @PreAuthorize("@ss.hasPermi('system:flowmeter:add')")
+    @Log(title = "流量计", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TFlowmeter tFlowmeter)
+    {
+        return toAjax(tFlowmeterService.insertTFlowmeter(tFlowmeter));
+    }
+
+    /**
+     * 修改流量计
+     */
+    @PreAuthorize("@ss.hasPermi('system:flowmeter:edit')")
+    @Log(title = "流量计", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TFlowmeter tFlowmeter)
+    {
+        return toAjax(tFlowmeterService.updateTFlowmeter(tFlowmeter));
+    }
+
+    /**
+     * 删除流量计
+     */
+    @PreAuthorize("@ss.hasPermi('system:flowmeter:remove')")
+    @Log(title = "流量计", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{flowmeterIds}")
+    public AjaxResult remove(@PathVariable Long[] flowmeterIds)
+    {
+        return toAjax(tFlowmeterService.deleteTFlowmeterByIds(flowmeterIds));
+    }
+}

gassafety-admin/src/main/java/com/zehong/web/controller/system/TGasMeterController.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.TGasMeter;
+import com.zehong.system.service.ITGasMeterService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 物联网燃气表Controller
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+@RestController
+@RequestMapping("/system/gasMeter")
+public class TGasMeterController extends BaseController
+{
+    @Autowired
+    private ITGasMeterService tGasMeterService;
+
+    /**
+     * 查询物联网燃气表列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:gasMeter:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TGasMeter tGasMeter)
+    {
+        startPage();
+        List<TGasMeter> list = tGasMeterService.selectTGasMeterList(tGasMeter);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出物联网燃气表列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:gasMeter:export')")
+    @Log(title = "物联网燃气表", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TGasMeter tGasMeter)
+    {
+        List<TGasMeter> list = tGasMeterService.selectTGasMeterList(tGasMeter);
+        ExcelUtil<TGasMeter> util = new ExcelUtil<TGasMeter>(TGasMeter.class);
+        return util.exportExcel(list, "物联网燃气表数据");
+    }
+
+    /**
+     * 获取物联网燃气表详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:gasMeter:query')")
+    @GetMapping(value = "/{gasId}")
+    public AjaxResult getInfo(@PathVariable("gasId") Long gasId)
+    {
+        return AjaxResult.success(tGasMeterService.selectTGasMeterById(gasId));
+    }
+
+    /**
+     * 新增物联网燃气表
+     */
+    @PreAuthorize("@ss.hasPermi('system:gasMeter:add')")
+    @Log(title = "物联网燃气表", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TGasMeter tGasMeter)
+    {
+        return toAjax(tGasMeterService.insertTGasMeter(tGasMeter));
+    }
+
+    /**
+     * 修改物联网燃气表
+     */
+    @PreAuthorize("@ss.hasPermi('system:gasMeter:edit')")
+    @Log(title = "物联网燃气表", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TGasMeter tGasMeter)
+    {
+        return toAjax(tGasMeterService.updateTGasMeter(tGasMeter));
+    }
+
+    /**
+     * 删除物联网燃气表
+     */
+    @PreAuthorize("@ss.hasPermi('system:gasMeter:remove')")
+    @Log(title = "物联网燃气表", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{gasIds}")
+    public AjaxResult remove(@PathVariable Long[] gasIds)
+    {
+        return toAjax(tGasMeterService.deleteTGasMeterByIds(gasIds));
+    }
+}

gassafety-admin/src/main/java/com/zehong/web/controller/system/TInspectorController.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.TInspector;
+import com.zehong.system.service.ITInspectorService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 巡检员Controller
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+@RestController
+@RequestMapping("/system/inspector")
+public class TInspectorController extends BaseController
+{
+    @Autowired
+    private ITInspectorService tInspectorService;
+
+    /**
+     * 查询巡检员列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:inspector:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TInspector tInspector)
+    {
+        startPage();
+        List<TInspector> list = tInspectorService.selectTInspectorList(tInspector);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出巡检员列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:inspector:export')")
+    @Log(title = "巡检员", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TInspector tInspector)
+    {
+        List<TInspector> list = tInspectorService.selectTInspectorList(tInspector);
+        ExcelUtil<TInspector> util = new ExcelUtil<TInspector>(TInspector.class);
+        return util.exportExcel(list, "巡检员数据");
+    }
+
+    /**
+     * 获取巡检员详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:inspector:query')")
+    @GetMapping(value = "/{inspectorId}")
+    public AjaxResult getInfo(@PathVariable("inspectorId") Long inspectorId)
+    {
+        return AjaxResult.success(tInspectorService.selectTInspectorById(inspectorId));
+    }
+
+    /**
+     * 新增巡检员
+     */
+    @PreAuthorize("@ss.hasPermi('system:inspector:add')")
+    @Log(title = "巡检员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TInspector tInspector)
+    {
+        return toAjax(tInspectorService.insertTInspector(tInspector));
+    }
+
+    /**
+     * 修改巡检员
+     */
+    @PreAuthorize("@ss.hasPermi('system:inspector:edit')")
+    @Log(title = "巡检员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TInspector tInspector)
+    {
+        return toAjax(tInspectorService.updateTInspector(tInspector));
+    }
+
+    /**
+     * 删除巡检员
+     */
+    @PreAuthorize("@ss.hasPermi('system:inspector:remove')")
+    @Log(title = "巡检员", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{inspectorIds}")
+    public AjaxResult remove(@PathVariable Long[] inspectorIds)
+    {
+        return toAjax(tInspectorService.deleteTInspectorByIds(inspectorIds));
+    }
+}

gassafety-admin/src/main/java/com/zehong/web/controller/system/TPipeController.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.TPipe;
+import com.zehong.system.service.ITPipeService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 管道信息Controller
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+@RestController
+@RequestMapping("/system/pipe")
+public class TPipeController extends BaseController
+{
+    @Autowired
+    private ITPipeService tPipeService;
+
+    /**
+     * 查询管道信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:pipe:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TPipe tPipe)
+    {
+        startPage();
+        List<TPipe> list = tPipeService.selectTPipeList(tPipe);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出管道信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:pipe:export')")
+    @Log(title = "管道信息", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TPipe tPipe)
+    {
+        List<TPipe> list = tPipeService.selectTPipeList(tPipe);
+        ExcelUtil<TPipe> util = new ExcelUtil<TPipe>(TPipe.class);
+        return util.exportExcel(list, "管道信息数据");
+    }
+
+    /**
+     * 获取管道信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:pipe:query')")
+    @GetMapping(value = "/{pipeId}")
+    public AjaxResult getInfo(@PathVariable("pipeId") Long pipeId)
+    {
+        return AjaxResult.success(tPipeService.selectTPipeById(pipeId));
+    }
+
+    /**
+     * 新增管道信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:pipe:add')")
+    @Log(title = "管道信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TPipe tPipe)
+    {
+        return toAjax(tPipeService.insertTPipe(tPipe));
+    }
+
+    /**
+     * 修改管道信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:pipe:edit')")
+    @Log(title = "管道信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TPipe tPipe)
+    {
+        return toAjax(tPipeService.updateTPipe(tPipe));
+    }
+
+    /**
+     * 删除管道信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:pipe:remove')")
+    @Log(title = "管道信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{pipeIds}")
+    public AjaxResult remove(@PathVariable Long[] pipeIds)
+    {
+        return toAjax(tPipeService.deleteTPipeByIds(pipeIds));
+    }
+}

gassafety-admin/src/main/java/com/zehong/web/controller/system/TRegulatorBoxController.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.TRegulatorBox;
+import com.zehong.system.service.ITRegulatorBoxService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 调压箱Controller
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+@RestController
+@RequestMapping("/system/regulatorBox")
+public class TRegulatorBoxController extends BaseController
+{
+    @Autowired
+    private ITRegulatorBoxService tRegulatorBoxService;
+
+    /**
+     * 查询调压箱列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:regulatorBox:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TRegulatorBox tRegulatorBox)
+    {
+        startPage();
+        List<TRegulatorBox> list = tRegulatorBoxService.selectTRegulatorBoxList(tRegulatorBox);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出调压箱列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:regulatorBox:export')")
+    @Log(title = "调压箱", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TRegulatorBox tRegulatorBox)
+    {
+        List<TRegulatorBox> list = tRegulatorBoxService.selectTRegulatorBoxList(tRegulatorBox);
+        ExcelUtil<TRegulatorBox> util = new ExcelUtil<TRegulatorBox>(TRegulatorBox.class);
+        return util.exportExcel(list, "调压箱数据");
+    }
+
+    /**
+     * 获取调压箱详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:regulatorBox:query')")
+    @GetMapping(value = "/{boxId}")
+    public AjaxResult getInfo(@PathVariable("boxId") Long boxId)
+    {
+        return AjaxResult.success(tRegulatorBoxService.selectTRegulatorBoxById(boxId));
+    }
+
+    /**
+     * 新增调压箱
+     */
+    @PreAuthorize("@ss.hasPermi('system:regulatorBox:add')")
+    @Log(title = "调压箱", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TRegulatorBox tRegulatorBox)
+    {
+        return toAjax(tRegulatorBoxService.insertTRegulatorBox(tRegulatorBox));
+    }
+
+    /**
+     * 修改调压箱
+     */
+    @PreAuthorize("@ss.hasPermi('system:regulatorBox:edit')")
+    @Log(title = "调压箱", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TRegulatorBox tRegulatorBox)
+    {
+        return toAjax(tRegulatorBoxService.updateTRegulatorBox(tRegulatorBox));
+    }
+
+    /**
+     * 删除调压箱
+     */
+    @PreAuthorize("@ss.hasPermi('system:regulatorBox:remove')")
+    @Log(title = "调压箱", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{boxIds}")
+    public AjaxResult remove(@PathVariable Long[] boxIds)
+    {
+        return toAjax(tRegulatorBoxService.deleteTRegulatorBoxByIds(boxIds));
+    }
+}

gassafety-admin/src/main/java/com/zehong/web/controller/system/TValveWellController.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.TValveWell;
+import com.zehong.system.service.ITValveWellService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 阀门井Controller
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+@RestController
+@RequestMapping("/system/valveWell")
+public class TValveWellController extends BaseController
+{
+    @Autowired
+    private ITValveWellService tValveWellService;
+
+    /**
+     * 查询阀门井列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:valveWell:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TValveWell tValveWell)
+    {
+        startPage();
+        List<TValveWell> list = tValveWellService.selectTValveWellList(tValveWell);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出阀门井列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:valveWell:export')")
+    @Log(title = "阀门井", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TValveWell tValveWell)
+    {
+        List<TValveWell> list = tValveWellService.selectTValveWellList(tValveWell);
+        ExcelUtil<TValveWell> util = new ExcelUtil<TValveWell>(TValveWell.class);
+        return util.exportExcel(list, "阀门井数据");
+    }
+
+    /**
+     * 获取阀门井详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('system:valveWell:query')")
+    @GetMapping(value = "/{wellId}")
+    public AjaxResult getInfo(@PathVariable("wellId") Long wellId)
+    {
+        return AjaxResult.success(tValveWellService.selectTValveWellById(wellId));
+    }
+
+    /**
+     * 新增阀门井
+     */
+    @PreAuthorize("@ss.hasPermi('system:valveWell:add')")
+    @Log(title = "阀门井", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TValveWell tValveWell)
+    {
+        return toAjax(tValveWellService.insertTValveWell(tValveWell));
+    }
+
+    /**
+     * 修改阀门井
+     */
+    @PreAuthorize("@ss.hasPermi('system:valveWell:edit')")
+    @Log(title = "阀门井", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TValveWell tValveWell)
+    {
+        return toAjax(tValveWellService.updateTValveWell(tValveWell));
+    }
+
+    /**
+     * 删除阀门井
+     */
+    @PreAuthorize("@ss.hasPermi('system:valveWell:remove')")
+    @Log(title = "阀门井", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{wellIds}")
+    public AjaxResult remove(@PathVariable Long[] wellIds)
+    {
+        return toAjax(tValveWellService.deleteTValveWellByIds(wellIds));
+    }
+}

gassafety-system/src/main/java/com/zehong/system/domain/TEnterpriseInfo.java

@@ -20,11 +20,11 @@ public class TEnterpriseInfo extends BaseEntity
     private Long infoId;
 
     /** 单位名称 */
-    @Excel(name = "单位名称")
+    @Excel(name = "企业名称")
     private String unitName;
 
     /** 组织机构代码 */
-    @Excel(name = "组织机构代码")
+    @Excel(name = "社会统一信用代码")
     private String orgCode;
 
     /** 营业执照图片路径 */
@@ -43,46 +43,6 @@ public class TEnterpriseInfo extends BaseEntity
     @Excel(name = "注册地址")
     private String regAddress;
 
-    /** 监管分类大类 */
-    @Excel(name = "监管分类大类")
-    private String regulationBigType;
-
-    /** 监管分类小类 */
-    @Excel(name = "监管分类小类")
-    private String regulationSmallType;
-
-    /** 省份代码 */
-    @Excel(name = "省份代码")
-    private String provinceId;
-
-    /** 省份名称 */
-    @Excel(name = "省份名称")
-    private String provinceName;
-
-    /** 城市代码 */
-    @Excel(name = "城市代码")
-    private String cityId;
-
-    /** 城市名称 */
-    @Excel(name = "城市名称")
-    private String cityName;
-
-    /** 区县代码 */
-    @Excel(name = "区县代码")
-    private String countyId;
-
-    /** 区县名称 */
-    @Excel(name = "区县名称")
-    private String countyName;
-
-    /** 所属地区 */
-    @Excel(name = "所属地区")
-    private String areaName;
-
-    /** 所属街道 */
-    @Excel(name = "所属街道")
-    private String streetName;
-
     /** 经度 */
     @Excel(name = "经度")
     private BigDecimal longitude;
@@ -96,33 +56,13 @@ public class TEnterpriseInfo extends BaseEntity
     private String legalPerson;
 
     /** 法定代表人手机 */
-    @Excel(name = "法定代表人手机")
+    @Excel(name = "法定代表人电话")
     private String legalPersonPhone;
 
-    /** 法定代表人座机号码 */
-    @Excel(name = "法定代表人座机号码")
-    private String legalPersonTelephone;
-
     /** 法人邮箱 */
     @Excel(name = "法人邮箱")
     private String legalPersonEmail;
 
-    /** 授权书 */
-    @Excel(name = "授权书")
-    private String authorizeFile;
-
-    /** 授权书文件原名 */
-    @Excel(name = "授权书文件原名")
-    private String authorizeFileOriginalName;
-
-    /** 厂区边界 */
-    @Excel(name = "厂区边界")
-    private String boundary;
-
-    /** 是否启用，0启用，1禁用 */
-    @Excel(name = "是否启用，0启用，1禁用")
-    private String isEnable;
-
     /** 创建人id */
     @Excel(name = "创建人id")
     private String createUserId;
@@ -198,96 +138,6 @@ public class TEnterpriseInfo extends BaseEntity
     {
         return regAddress;
     }
-    public void setRegulationBigType(String regulationBigType) 
-    {
-        this.regulationBigType = regulationBigType;
-    }
-
-    public String getRegulationBigType() 
-    {
-        return regulationBigType;
-    }
-    public void setRegulationSmallType(String regulationSmallType) 
-    {
-        this.regulationSmallType = regulationSmallType;
-    }
-
-    public String getRegulationSmallType() 
-    {
-        return regulationSmallType;
-    }
-    public void setProvinceId(String provinceId) 
-    {
-        this.provinceId = provinceId;
-    }
-
-    public String getProvinceId() 
-    {
-        return provinceId;
-    }
-    public void setProvinceName(String provinceName) 
-    {
-        this.provinceName = provinceName;
-    }
-
-    public String getProvinceName() 
-    {
-        return provinceName;
-    }
-    public void setCityId(String cityId) 
-    {
-        this.cityId = cityId;
-    }
-
-    public String getCityId() 
-    {
-        return cityId;
-    }
-    public void setCityName(String cityName) 
-    {
-        this.cityName = cityName;
-    }
-
-    public String getCityName() 
-    {
-        return cityName;
-    }
-    public void setCountyId(String countyId) 
-    {
-        this.countyId = countyId;
-    }
-
-    public String getCountyId() 
-    {
-        return countyId;
-    }
-    public void setCountyName(String countyName) 
-    {
-        this.countyName = countyName;
-    }
-
-    public String getCountyName() 
-    {
-        return countyName;
-    }
-    public void setAreaName(String areaName) 
-    {
-        this.areaName = areaName;
-    }
-
-    public String getAreaName() 
-    {
-        return areaName;
-    }
-    public void setStreetName(String streetName) 
-    {
-        this.streetName = streetName;
-    }
-
-    public String getStreetName() 
-    {
-        return streetName;
-    }
     public void setLongitude(BigDecimal longitude)
     {
         this.longitude = longitude;
@@ -324,15 +174,6 @@ public class TEnterpriseInfo extends BaseEntity
     {
         return legalPersonPhone;
     }
-    public void setLegalPersonTelephone(String legalPersonTelephone) 
-    {
-        this.legalPersonTelephone = legalPersonTelephone;
-    }
-
-    public String getLegalPersonTelephone() 
-    {
-        return legalPersonTelephone;
-    }
     public void setLegalPersonEmail(String legalPersonEmail) 
     {
         this.legalPersonEmail = legalPersonEmail;
@@ -342,42 +183,6 @@ public class TEnterpriseInfo extends BaseEntity
     {
         return legalPersonEmail;
     }
-    public void setAuthorizeFile(String authorizeFile) 
-    {
-        this.authorizeFile = authorizeFile;
-    }
-
-    public String getAuthorizeFile() 
-    {
-        return authorizeFile;
-    }
-    public void setAuthorizeFileOriginalName(String authorizeFileOriginalName) 
-    {
-        this.authorizeFileOriginalName = authorizeFileOriginalName;
-    }
-
-    public String getAuthorizeFileOriginalName() 
-    {
-        return authorizeFileOriginalName;
-    }
-    public void setBoundary(String boundary) 
-    {
-        this.boundary = boundary;
-    }
-
-    public String getBoundary() 
-    {
-        return boundary;
-    }
-    public void setIsEnable(String isEnable) 
-    {
-        this.isEnable = isEnable;
-    }
-
-    public String getIsEnable() 
-    {
-        return isEnable;
-    }
     public void setCreateUserId(String createUserId) 
     {
         this.createUserId = createUserId;
@@ -416,26 +221,11 @@ public class TEnterpriseInfo extends BaseEntity
             .append("orgFileName", getOrgFileName())
             .append("runAddress", getRunAddress())
             .append("regAddress", getRegAddress())
-            .append("regulationBigType", getRegulationBigType())
-            .append("regulationSmallType", getRegulationSmallType())
-            .append("provinceId", getProvinceId())
-            .append("provinceName", getProvinceName())
-            .append("cityId", getCityId())
-            .append("cityName", getCityName())
-            .append("countyId", getCountyId())
-            .append("countyName", getCountyName())
-            .append("areaName", getAreaName())
-            .append("streetName", getStreetName())
             .append("longitude", getLongitude())
             .append("latitude", getLatitude())
             .append("legalPerson", getLegalPerson())
             .append("legalPersonPhone", getLegalPersonPhone())
-            .append("legalPersonTelephone", getLegalPersonTelephone())
             .append("legalPersonEmail", getLegalPersonEmail())
-            .append("authorizeFile", getAuthorizeFile())
-            .append("authorizeFileOriginalName", getAuthorizeFileOriginalName())
-            .append("boundary", getBoundary())
-            .append("isEnable", getIsEnable())
             .append("createUserId", getCreateUserId())
             .append("updateUserId", getUpdateUserId())
             .append("updateTime", getUpdateTime())

gassafety-system/src/main/java/com/zehong/system/domain/TFlowmeter.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_flowmeter
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public class TFlowmeter extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 流量计id */
+    private Long flowmeterId;
+
+    /** 企业id */
+    @Excel(name = "企业id")
+    private Long enterpriseId;
+
+    /** 所属管道id */
+    @Excel(name = "所属管道id")
+    private Long pipeId;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String deviceName;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String deviceAddr;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String deviceModel;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    /** 物联网编号 */
+    @Excel(name = "物联网编号")
+    private String iotNo;
+
+    /** 设备图片路径 */
+    @Excel(name = "设备图片路径")
+    private String iconUrl;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String linkman;
+
+    /** 电话 */
+    @Excel(name = "电话")
+    private String phone;
+
+    /** 安装时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date installationTime;
+
+    /** 最后巡检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最后巡检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inspectionTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setFlowmeterId(Long flowmeterId) 
+    {
+        this.flowmeterId = flowmeterId;
+    }
+
+    public Long getFlowmeterId() 
+    {
+        return flowmeterId;
+    }
+    public void setEnterpriseId(Long enterpriseId) 
+    {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getEnterpriseId() 
+    {
+        return enterpriseId;
+    }
+    public void setPipeId(Long pipeId) 
+    {
+        this.pipeId = pipeId;
+    }
+
+    public Long getPipeId() 
+    {
+        return pipeId;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setDeviceAddr(String deviceAddr) 
+    {
+        this.deviceAddr = deviceAddr;
+    }
+
+    public String getDeviceAddr() 
+    {
+        return deviceAddr;
+    }
+    public void setDeviceModel(String deviceModel) 
+    {
+        this.deviceModel = deviceModel;
+    }
+
+    public String getDeviceModel() 
+    {
+        return deviceModel;
+    }
+    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 setIotNo(String iotNo) 
+    {
+        this.iotNo = iotNo;
+    }
+
+    public String getIotNo() 
+    {
+        return iotNo;
+    }
+    public void setIconUrl(String iconUrl) 
+    {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconUrl() 
+    {
+        return iconUrl;
+    }
+    public void setLinkman(String linkman) 
+    {
+        this.linkman = linkman;
+    }
+
+    public String getLinkman() 
+    {
+        return linkman;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setInstallationTime(Date installationTime) 
+    {
+        this.installationTime = installationTime;
+    }
+
+    public Date getInstallationTime() 
+    {
+        return installationTime;
+    }
+    public void setInspectionTime(Date inspectionTime) 
+    {
+        this.inspectionTime = inspectionTime;
+    }
+
+    public Date getInspectionTime() 
+    {
+        return inspectionTime;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("flowmeterId", getFlowmeterId())
+            .append("enterpriseId", getEnterpriseId())
+            .append("pipeId", getPipeId())
+            .append("deviceName", getDeviceName())
+            .append("deviceAddr", getDeviceAddr())
+            .append("deviceModel", getDeviceModel())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("iotNo", getIotNo())
+            .append("iconUrl", getIconUrl())
+            .append("linkman", getLinkman())
+            .append("phone", getPhone())
+            .append("installationTime", getInstallationTime())
+            .append("inspectionTime", getInspectionTime())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafety-system/src/main/java/com/zehong/system/domain/TGasMeter.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_meter
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public class TGasMeter extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 燃气表id */
+    private Long gasId;
+
+    /** 企业id */
+    @Excel(name = "企业id")
+    private Long enterpriseId;
+
+    /** 所属管道id */
+    @Excel(name = "所属管道id")
+    private Long pipeId;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String deviceName;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String deviceAddr;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String deviceModel;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    /** 物联网编号 */
+    @Excel(name = "物联网编号")
+    private String iotNo;
+
+    /** 设备图片路径 */
+    @Excel(name = "设备图片路径")
+    private String iconUrl;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String linkman;
+
+    /** 电话 */
+    @Excel(name = "电话")
+    private String phone;
+
+    /** 安装时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date installationTime;
+
+    /** 最后巡检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最后巡检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inspectionTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setGasId(Long gasId) 
+    {
+        this.gasId = gasId;
+    }
+
+    public Long getGasId() 
+    {
+        return gasId;
+    }
+    public void setEnterpriseId(Long enterpriseId) 
+    {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getEnterpriseId() 
+    {
+        return enterpriseId;
+    }
+    public void setPipeId(Long pipeId) 
+    {
+        this.pipeId = pipeId;
+    }
+
+    public Long getPipeId() 
+    {
+        return pipeId;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setDeviceAddr(String deviceAddr) 
+    {
+        this.deviceAddr = deviceAddr;
+    }
+
+    public String getDeviceAddr() 
+    {
+        return deviceAddr;
+    }
+    public void setDeviceModel(String deviceModel) 
+    {
+        this.deviceModel = deviceModel;
+    }
+
+    public String getDeviceModel() 
+    {
+        return deviceModel;
+    }
+    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 setIotNo(String iotNo) 
+    {
+        this.iotNo = iotNo;
+    }
+
+    public String getIotNo() 
+    {
+        return iotNo;
+    }
+    public void setIconUrl(String iconUrl) 
+    {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconUrl() 
+    {
+        return iconUrl;
+    }
+    public void setLinkman(String linkman) 
+    {
+        this.linkman = linkman;
+    }
+
+    public String getLinkman() 
+    {
+        return linkman;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setInstallationTime(Date installationTime) 
+    {
+        this.installationTime = installationTime;
+    }
+
+    public Date getInstallationTime() 
+    {
+        return installationTime;
+    }
+    public void setInspectionTime(Date inspectionTime) 
+    {
+        this.inspectionTime = inspectionTime;
+    }
+
+    public Date getInspectionTime() 
+    {
+        return inspectionTime;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("gasId", getGasId())
+            .append("enterpriseId", getEnterpriseId())
+            .append("pipeId", getPipeId())
+            .append("deviceName", getDeviceName())
+            .append("deviceAddr", getDeviceAddr())
+            .append("deviceModel", getDeviceModel())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("iotNo", getIotNo())
+            .append("iconUrl", getIconUrl())
+            .append("linkman", getLinkman())
+            .append("phone", getPhone())
+            .append("installationTime", getInstallationTime())
+            .append("inspectionTime", getInspectionTime())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafety-system/src/main/java/com/zehong/system/domain/TInspector.java

+package com.zehong.system.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 巡检员对象 t_inspector
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public class TInspector extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 巡检员id */
+    private Long inspectorId;
+
+    /** 企业id */
+    @Excel(name = "企业id")
+    private Long enterpriseId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 电话 */
+    @Excel(name = "电话")
+    private String phone;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setInspectorId(Long inspectorId) 
+    {
+        this.inspectorId = inspectorId;
+    }
+
+    public Long getInspectorId() 
+    {
+        return inspectorId;
+    }
+    public void setEnterpriseId(Long enterpriseId) 
+    {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getEnterpriseId() 
+    {
+        return enterpriseId;
+    }
+    public void setName(String name) 
+    {
+        this.name = name;
+    }
+
+    public String getName() 
+    {
+        return name;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("inspectorId", getInspectorId())
+            .append("enterpriseId", getEnterpriseId())
+            .append("name", getName())
+            .append("phone", getPhone())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafety-system/src/main/java/com/zehong/system/domain/TPipe.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_pipe
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public class TPipe extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 管道id */
+    private Long pipeId;
+
+    /** 企业id */
+    @Excel(name = "企业id")
+    private Long enterpriseId;
+
+    /** 管道名称 */
+    @Excel(name = "管道名称")
+    private String pipeName;
+
+    /** 管道所在地址 */
+    @Excel(name = "管道所在地址")
+    private String pipeAddr;
+
+    /** 坐标 */
+    @Excel(name = "坐标")
+    private String coordinates;
+
+    /** 管道长度 */
+    @Excel(name = "管道长度")
+    private Long pipeLength;
+
+    /** 管道类型（1地埋管线、2地表管线） */
+    @Excel(name = "管道类型", readConverterExp = "1=地埋管线、2地表管线")
+    private String pipeType;
+
+    /** 管道压力（低压，中压，次高压，高压） */
+    @Excel(name = "管道压力", readConverterExp = "低=压，中压，次高压，高压")
+    private String pipePressure;
+
+    /** 设备图片路径 */
+    @Excel(name = "设备图片路径")
+    private String iconUrl;
+
+    /** 安装时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date installationTime;
+
+    /** 最后巡检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最后巡检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inspectionTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setPipeId(Long pipeId) 
+    {
+        this.pipeId = pipeId;
+    }
+
+    public Long getPipeId() 
+    {
+        return pipeId;
+    }
+    public void setEnterpriseId(Long enterpriseId) 
+    {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getEnterpriseId() 
+    {
+        return enterpriseId;
+    }
+    public void setPipeName(String pipeName) 
+    {
+        this.pipeName = pipeName;
+    }
+
+    public String getPipeName() 
+    {
+        return pipeName;
+    }
+    public void setPipeAddr(String pipeAddr) 
+    {
+        this.pipeAddr = pipeAddr;
+    }
+
+    public String getPipeAddr() 
+    {
+        return pipeAddr;
+    }
+    public void setCoordinates(String coordinates) 
+    {
+        this.coordinates = coordinates;
+    }
+
+    public String getCoordinates() 
+    {
+        return coordinates;
+    }
+    public void setPipeLength(Long pipeLength) 
+    {
+        this.pipeLength = pipeLength;
+    }
+
+    public Long getPipeLength() 
+    {
+        return pipeLength;
+    }
+    public void setPipeType(String pipeType) 
+    {
+        this.pipeType = pipeType;
+    }
+
+    public String getPipeType() 
+    {
+        return pipeType;
+    }
+    public void setPipePressure(String pipePressure) 
+    {
+        this.pipePressure = pipePressure;
+    }
+
+    public String getPipePressure() 
+    {
+        return pipePressure;
+    }
+    public void setIconUrl(String iconUrl) 
+    {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconUrl() 
+    {
+        return iconUrl;
+    }
+    public void setInstallationTime(Date installationTime) 
+    {
+        this.installationTime = installationTime;
+    }
+
+    public Date getInstallationTime() 
+    {
+        return installationTime;
+    }
+    public void setInspectionTime(Date inspectionTime) 
+    {
+        this.inspectionTime = inspectionTime;
+    }
+
+    public Date getInspectionTime() 
+    {
+        return inspectionTime;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("pipeId", getPipeId())
+            .append("enterpriseId", getEnterpriseId())
+            .append("pipeName", getPipeName())
+            .append("pipeAddr", getPipeAddr())
+            .append("coordinates", getCoordinates())
+            .append("pipeLength", getPipeLength())
+            .append("pipeType", getPipeType())
+            .append("pipePressure", getPipePressure())
+            .append("iconUrl", getIconUrl())
+            .append("installationTime", getInstallationTime())
+            .append("inspectionTime", getInspectionTime())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafety-system/src/main/java/com/zehong/system/domain/TRegulatorBox.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_regulator_box
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public class TRegulatorBox extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 调压箱id */
+    private Long boxId;
+
+    /** 企业id */
+    @Excel(name = "企业id")
+    private Long enterpriseId;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String deviceName;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String deviceAddr;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String deviceModel;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    /** 设备图片路径 */
+    @Excel(name = "设备图片路径")
+    private String iconUrl;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String linkman;
+
+    /** 电话 */
+    @Excel(name = "电话")
+    private String phone;
+
+    /** 安装时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date installationTime;
+
+    /** 最后巡检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最后巡检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inspectionTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setBoxId(Long boxId) 
+    {
+        this.boxId = boxId;
+    }
+
+    public Long getBoxId() 
+    {
+        return boxId;
+    }
+    public void setEnterpriseId(Long enterpriseId) 
+    {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getEnterpriseId() 
+    {
+        return enterpriseId;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setDeviceAddr(String deviceAddr) 
+    {
+        this.deviceAddr = deviceAddr;
+    }
+
+    public String getDeviceAddr() 
+    {
+        return deviceAddr;
+    }
+    public void setDeviceModel(String deviceModel) 
+    {
+        this.deviceModel = deviceModel;
+    }
+
+    public String getDeviceModel() 
+    {
+        return deviceModel;
+    }
+    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 setIconUrl(String iconUrl) 
+    {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconUrl() 
+    {
+        return iconUrl;
+    }
+    public void setLinkman(String linkman) 
+    {
+        this.linkman = linkman;
+    }
+
+    public String getLinkman() 
+    {
+        return linkman;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setInstallationTime(Date installationTime) 
+    {
+        this.installationTime = installationTime;
+    }
+
+    public Date getInstallationTime() 
+    {
+        return installationTime;
+    }
+    public void setInspectionTime(Date inspectionTime) 
+    {
+        this.inspectionTime = inspectionTime;
+    }
+
+    public Date getInspectionTime() 
+    {
+        return inspectionTime;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("boxId", getBoxId())
+            .append("enterpriseId", getEnterpriseId())
+            .append("deviceName", getDeviceName())
+            .append("deviceAddr", getDeviceAddr())
+            .append("deviceModel", getDeviceModel())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("iconUrl", getIconUrl())
+            .append("linkman", getLinkman())
+            .append("phone", getPhone())
+            .append("installationTime", getInstallationTime())
+            .append("inspectionTime", getInspectionTime())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafety-system/src/main/java/com/zehong/system/domain/TValveWell.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_valve_well
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public class TValveWell extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 阀门井id */
+    private Long wellId;
+
+    /** 企业id */
+    @Excel(name = "企业id")
+    private Long enterpriseId;
+
+    /** 名称 */
+    @Excel(name = "名称")
+    private String deviceName;
+
+    /** 地址 */
+    @Excel(name = "地址")
+    private String deviceAddr;
+
+    /** 型号 */
+    @Excel(name = "型号")
+    private String deviceModel;
+
+    /** 经度 */
+    @Excel(name = "经度")
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    @Excel(name = "纬度")
+    private BigDecimal latitude;
+
+    /** 设备图片路径 */
+    @Excel(name = "设备图片路径")
+    private String iconUrl;
+
+    /** 联系人 */
+    @Excel(name = "联系人")
+    private String linkman;
+
+    /** 电话 */
+    @Excel(name = "电话")
+    private String phone;
+
+    /** 安装时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "安装时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date installationTime;
+
+    /** 最后巡检时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "最后巡检时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date inspectionTime;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    public void setWellId(Long wellId) 
+    {
+        this.wellId = wellId;
+    }
+
+    public Long getWellId() 
+    {
+        return wellId;
+    }
+    public void setEnterpriseId(Long enterpriseId) 
+    {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public Long getEnterpriseId() 
+    {
+        return enterpriseId;
+    }
+    public void setDeviceName(String deviceName) 
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() 
+    {
+        return deviceName;
+    }
+    public void setDeviceAddr(String deviceAddr) 
+    {
+        this.deviceAddr = deviceAddr;
+    }
+
+    public String getDeviceAddr() 
+    {
+        return deviceAddr;
+    }
+    public void setDeviceModel(String deviceModel) 
+    {
+        this.deviceModel = deviceModel;
+    }
+
+    public String getDeviceModel() 
+    {
+        return deviceModel;
+    }
+    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 setIconUrl(String iconUrl) 
+    {
+        this.iconUrl = iconUrl;
+    }
+
+    public String getIconUrl() 
+    {
+        return iconUrl;
+    }
+    public void setLinkman(String linkman) 
+    {
+        this.linkman = linkman;
+    }
+
+    public String getLinkman() 
+    {
+        return linkman;
+    }
+    public void setPhone(String phone) 
+    {
+        this.phone = phone;
+    }
+
+    public String getPhone() 
+    {
+        return phone;
+    }
+    public void setInstallationTime(Date installationTime) 
+    {
+        this.installationTime = installationTime;
+    }
+
+    public Date getInstallationTime() 
+    {
+        return installationTime;
+    }
+    public void setInspectionTime(Date inspectionTime) 
+    {
+        this.inspectionTime = inspectionTime;
+    }
+
+    public Date getInspectionTime() 
+    {
+        return inspectionTime;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("wellId", getWellId())
+            .append("enterpriseId", getEnterpriseId())
+            .append("deviceName", getDeviceName())
+            .append("deviceAddr", getDeviceAddr())
+            .append("deviceModel", getDeviceModel())
+            .append("longitude", getLongitude())
+            .append("latitude", getLatitude())
+            .append("iconUrl", getIconUrl())
+            .append("linkman", getLinkman())
+            .append("phone", getPhone())
+            .append("installationTime", getInstallationTime())
+            .append("inspectionTime", getInspectionTime())
+            .append("remarks", getRemarks())
+            .toString();
+    }
+}

gassafety-system/src/main/java/com/zehong/system/mapper/TFlowmeterMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TFlowmeter;
+
+/**
+ * 流量计Mapper接口
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public interface TFlowmeterMapper 
+{
+    /**
+     * 查询流量计
+     * 
+     * @param flowmeterId 流量计ID
+     * @return 流量计
+     */
+    public TFlowmeter selectTFlowmeterById(Long flowmeterId);
+
+    /**
+     * 查询流量计列表
+     * 
+     * @param tFlowmeter 流量计
+     * @return 流量计集合
+     */
+    public List<TFlowmeter> selectTFlowmeterList(TFlowmeter tFlowmeter);
+
+    /**
+     * 新增流量计
+     * 
+     * @param tFlowmeter 流量计
+     * @return 结果
+     */
+    public int insertTFlowmeter(TFlowmeter tFlowmeter);
+
+    /**
+     * 修改流量计
+     * 
+     * @param tFlowmeter 流量计
+     * @return 结果
+     */
+    public int updateTFlowmeter(TFlowmeter tFlowmeter);
+
+    /**
+     * 删除流量计
+     * 
+     * @param flowmeterId 流量计ID
+     * @return 结果
+     */
+    public int deleteTFlowmeterById(Long flowmeterId);
+
+    /**
+     * 批量删除流量计
+     * 
+     * @param flowmeterIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTFlowmeterByIds(Long[] flowmeterIds);
+}

gassafety-system/src/main/java/com/zehong/system/mapper/TGasMeterMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TGasMeter;
+
+/**
+ * 物联网燃气表Mapper接口
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public interface TGasMeterMapper 
+{
+    /**
+     * 查询物联网燃气表
+     * 
+     * @param gasId 物联网燃气表ID
+     * @return 物联网燃气表
+     */
+    public TGasMeter selectTGasMeterById(Long gasId);
+
+    /**
+     * 查询物联网燃气表列表
+     * 
+     * @param tGasMeter 物联网燃气表
+     * @return 物联网燃气表集合
+     */
+    public List<TGasMeter> selectTGasMeterList(TGasMeter tGasMeter);
+
+    /**
+     * 新增物联网燃气表
+     * 
+     * @param tGasMeter 物联网燃气表
+     * @return 结果
+     */
+    public int insertTGasMeter(TGasMeter tGasMeter);
+
+    /**
+     * 修改物联网燃气表
+     * 
+     * @param tGasMeter 物联网燃气表
+     * @return 结果
+     */
+    public int updateTGasMeter(TGasMeter tGasMeter);
+
+    /**
+     * 删除物联网燃气表
+     * 
+     * @param gasId 物联网燃气表ID
+     * @return 结果
+     */
+    public int deleteTGasMeterById(Long gasId);
+
+    /**
+     * 批量删除物联网燃气表
+     * 
+     * @param gasIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTGasMeterByIds(Long[] gasIds);
+}

gassafety-system/src/main/java/com/zehong/system/mapper/TInspectorMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TInspector;
+
+/**
+ * 巡检员Mapper接口
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public interface TInspectorMapper 
+{
+    /**
+     * 查询巡检员
+     * 
+     * @param inspectorId 巡检员ID
+     * @return 巡检员
+     */
+    public TInspector selectTInspectorById(Long inspectorId);
+
+    /**
+     * 查询巡检员列表
+     * 
+     * @param tInspector 巡检员
+     * @return 巡检员集合
+     */
+    public List<TInspector> selectTInspectorList(TInspector tInspector);
+
+    /**
+     * 新增巡检员
+     * 
+     * @param tInspector 巡检员
+     * @return 结果
+     */
+    public int insertTInspector(TInspector tInspector);
+
+    /**
+     * 修改巡检员
+     * 
+     * @param tInspector 巡检员
+     * @return 结果
+     */
+    public int updateTInspector(TInspector tInspector);
+
+    /**
+     * 删除巡检员
+     * 
+     * @param inspectorId 巡检员ID
+     * @return 结果
+     */
+    public int deleteTInspectorById(Long inspectorId);
+
+    /**
+     * 批量删除巡检员
+     * 
+     * @param inspectorIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTInspectorByIds(Long[] inspectorIds);
+}

gassafety-system/src/main/java/com/zehong/system/mapper/TPipeMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TPipe;
+
+/**
+ * 管道信息Mapper接口
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public interface TPipeMapper 
+{
+    /**
+     * 查询管道信息
+     * 
+     * @param pipeId 管道信息ID
+     * @return 管道信息
+     */
+    public TPipe selectTPipeById(Long pipeId);
+
+    /**
+     * 查询管道信息列表
+     * 
+     * @param tPipe 管道信息
+     * @return 管道信息集合
+     */
+    public List<TPipe> selectTPipeList(TPipe tPipe);
+
+    /**
+     * 新增管道信息
+     * 
+     * @param tPipe 管道信息
+     * @return 结果
+     */
+    public int insertTPipe(TPipe tPipe);
+
+    /**
+     * 修改管道信息
+     * 
+     * @param tPipe 管道信息
+     * @return 结果
+     */
+    public int updateTPipe(TPipe tPipe);
+
+    /**
+     * 删除管道信息
+     * 
+     * @param pipeId 管道信息ID
+     * @return 结果
+     */
+    public int deleteTPipeById(Long pipeId);
+
+    /**
+     * 批量删除管道信息
+     * 
+     * @param pipeIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTPipeByIds(Long[] pipeIds);
+}

gassafety-system/src/main/java/com/zehong/system/mapper/TRegulatorBoxMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TRegulatorBox;
+
+/**
+ * 调压箱Mapper接口
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public interface TRegulatorBoxMapper 
+{
+    /**
+     * 查询调压箱
+     * 
+     * @param boxId 调压箱ID
+     * @return 调压箱
+     */
+    public TRegulatorBox selectTRegulatorBoxById(Long boxId);
+
+    /**
+     * 查询调压箱列表
+     * 
+     * @param tRegulatorBox 调压箱
+     * @return 调压箱集合
+     */
+    public List<TRegulatorBox> selectTRegulatorBoxList(TRegulatorBox tRegulatorBox);
+
+    /**
+     * 新增调压箱
+     * 
+     * @param tRegulatorBox 调压箱
+     * @return 结果
+     */
+    public int insertTRegulatorBox(TRegulatorBox tRegulatorBox);
+
+    /**
+     * 修改调压箱
+     * 
+     * @param tRegulatorBox 调压箱
+     * @return 结果
+     */
+    public int updateTRegulatorBox(TRegulatorBox tRegulatorBox);
+
+    /**
+     * 删除调压箱
+     * 
+     * @param boxId 调压箱ID
+     * @return 结果
+     */
+    public int deleteTRegulatorBoxById(Long boxId);
+
+    /**
+     * 批量删除调压箱
+     * 
+     * @param boxIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTRegulatorBoxByIds(Long[] boxIds);
+}

gassafety-system/src/main/java/com/zehong/system/mapper/TValveWellMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TValveWell;
+
+/**
+ * 阀门井Mapper接口
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public interface TValveWellMapper 
+{
+    /**
+     * 查询阀门井
+     * 
+     * @param wellId 阀门井ID
+     * @return 阀门井
+     */
+    public TValveWell selectTValveWellById(Long wellId);
+
+    /**
+     * 查询阀门井列表
+     * 
+     * @param tValveWell 阀门井
+     * @return 阀门井集合
+     */
+    public List<TValveWell> selectTValveWellList(TValveWell tValveWell);
+
+    /**
+     * 新增阀门井
+     * 
+     * @param tValveWell 阀门井
+     * @return 结果
+     */
+    public int insertTValveWell(TValveWell tValveWell);
+
+    /**
+     * 修改阀门井
+     * 
+     * @param tValveWell 阀门井
+     * @return 结果
+     */
+    public int updateTValveWell(TValveWell tValveWell);
+
+    /**
+     * 删除阀门井
+     * 
+     * @param wellId 阀门井ID
+     * @return 结果
+     */
+    public int deleteTValveWellById(Long wellId);
+
+    /**
+     * 批量删除阀门井
+     * 
+     * @param wellIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTValveWellByIds(Long[] wellIds);
+}

gassafety-system/src/main/java/com/zehong/system/service/ITFlowmeterService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TFlowmeter;
+
+/**
+ * 流量计Service接口
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public interface ITFlowmeterService 
+{
+    /**
+     * 查询流量计
+     * 
+     * @param flowmeterId 流量计ID
+     * @return 流量计
+     */
+    public TFlowmeter selectTFlowmeterById(Long flowmeterId);
+
+    /**
+     * 查询流量计列表
+     * 
+     * @param tFlowmeter 流量计
+     * @return 流量计集合
+     */
+    public List<TFlowmeter> selectTFlowmeterList(TFlowmeter tFlowmeter);
+
+    /**
+     * 新增流量计
+     * 
+     * @param tFlowmeter 流量计
+     * @return 结果
+     */
+    public int insertTFlowmeter(TFlowmeter tFlowmeter);
+
+    /**
+     * 修改流量计
+     * 
+     * @param tFlowmeter 流量计
+     * @return 结果
+     */
+    public int updateTFlowmeter(TFlowmeter tFlowmeter);
+
+    /**
+     * 批量删除流量计
+     * 
+     * @param flowmeterIds 需要删除的流量计ID
+     * @return 结果
+     */
+    public int deleteTFlowmeterByIds(Long[] flowmeterIds);
+
+    /**
+     * 删除流量计信息
+     * 
+     * @param flowmeterId 流量计ID
+     * @return 结果
+     */
+    public int deleteTFlowmeterById(Long flowmeterId);
+}

gassafety-system/src/main/java/com/zehong/system/service/ITGasMeterService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TGasMeter;
+
+/**
+ * 物联网燃气表Service接口
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public interface ITGasMeterService 
+{
+    /**
+     * 查询物联网燃气表
+     * 
+     * @param gasId 物联网燃气表ID
+     * @return 物联网燃气表
+     */
+    public TGasMeter selectTGasMeterById(Long gasId);
+
+    /**
+     * 查询物联网燃气表列表
+     * 
+     * @param tGasMeter 物联网燃气表
+     * @return 物联网燃气表集合
+     */
+    public List<TGasMeter> selectTGasMeterList(TGasMeter tGasMeter);
+
+    /**
+     * 新增物联网燃气表
+     * 
+     * @param tGasMeter 物联网燃气表
+     * @return 结果
+     */
+    public int insertTGasMeter(TGasMeter tGasMeter);
+
+    /**
+     * 修改物联网燃气表
+     * 
+     * @param tGasMeter 物联网燃气表
+     * @return 结果
+     */
+    public int updateTGasMeter(TGasMeter tGasMeter);
+
+    /**
+     * 批量删除物联网燃气表
+     * 
+     * @param gasIds 需要删除的物联网燃气表ID
+     * @return 结果
+     */
+    public int deleteTGasMeterByIds(Long[] gasIds);
+
+    /**
+     * 删除物联网燃气表信息
+     * 
+     * @param gasId 物联网燃气表ID
+     * @return 结果
+     */
+    public int deleteTGasMeterById(Long gasId);
+}

gassafety-system/src/main/java/com/zehong/system/service/ITInspectorService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TInspector;
+
+/**
+ * 巡检员Service接口
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public interface ITInspectorService 
+{
+    /**
+     * 查询巡检员
+     * 
+     * @param inspectorId 巡检员ID
+     * @return 巡检员
+     */
+    public TInspector selectTInspectorById(Long inspectorId);
+
+    /**
+     * 查询巡检员列表
+     * 
+     * @param tInspector 巡检员
+     * @return 巡检员集合
+     */
+    public List<TInspector> selectTInspectorList(TInspector tInspector);
+
+    /**
+     * 新增巡检员
+     * 
+     * @param tInspector 巡检员
+     * @return 结果
+     */
+    public int insertTInspector(TInspector tInspector);
+
+    /**
+     * 修改巡检员
+     * 
+     * @param tInspector 巡检员
+     * @return 结果
+     */
+    public int updateTInspector(TInspector tInspector);
+
+    /**
+     * 批量删除巡检员
+     * 
+     * @param inspectorIds 需要删除的巡检员ID
+     * @return 结果
+     */
+    public int deleteTInspectorByIds(Long[] inspectorIds);
+
+    /**
+     * 删除巡检员信息
+     * 
+     * @param inspectorId 巡检员ID
+     * @return 结果
+     */
+    public int deleteTInspectorById(Long inspectorId);
+}

gassafety-system/src/main/java/com/zehong/system/service/ITPipeService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TPipe;
+
+/**
+ * 管道信息Service接口
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public interface ITPipeService 
+{
+    /**
+     * 查询管道信息
+     * 
+     * @param pipeId 管道信息ID
+     * @return 管道信息
+     */
+    public TPipe selectTPipeById(Long pipeId);
+
+    /**
+     * 查询管道信息列表
+     * 
+     * @param tPipe 管道信息
+     * @return 管道信息集合
+     */
+    public List<TPipe> selectTPipeList(TPipe tPipe);
+
+    /**
+     * 新增管道信息
+     * 
+     * @param tPipe 管道信息
+     * @return 结果
+     */
+    public int insertTPipe(TPipe tPipe);
+
+    /**
+     * 修改管道信息
+     * 
+     * @param tPipe 管道信息
+     * @return 结果
+     */
+    public int updateTPipe(TPipe tPipe);
+
+    /**
+     * 批量删除管道信息
+     * 
+     * @param pipeIds 需要删除的管道信息ID
+     * @return 结果
+     */
+    public int deleteTPipeByIds(Long[] pipeIds);
+
+    /**
+     * 删除管道信息信息
+     * 
+     * @param pipeId 管道信息ID
+     * @return 结果
+     */
+    public int deleteTPipeById(Long pipeId);
+}

gassafety-system/src/main/java/com/zehong/system/service/ITRegulatorBoxService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TRegulatorBox;
+
+/**
+ * 调压箱Service接口
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public interface ITRegulatorBoxService 
+{
+    /**
+     * 查询调压箱
+     * 
+     * @param boxId 调压箱ID
+     * @return 调压箱
+     */
+    public TRegulatorBox selectTRegulatorBoxById(Long boxId);
+
+    /**
+     * 查询调压箱列表
+     * 
+     * @param tRegulatorBox 调压箱
+     * @return 调压箱集合
+     */
+    public List<TRegulatorBox> selectTRegulatorBoxList(TRegulatorBox tRegulatorBox);
+
+    /**
+     * 新增调压箱
+     * 
+     * @param tRegulatorBox 调压箱
+     * @return 结果
+     */
+    public int insertTRegulatorBox(TRegulatorBox tRegulatorBox);
+
+    /**
+     * 修改调压箱
+     * 
+     * @param tRegulatorBox 调压箱
+     * @return 结果
+     */
+    public int updateTRegulatorBox(TRegulatorBox tRegulatorBox);
+
+    /**
+     * 批量删除调压箱
+     * 
+     * @param boxIds 需要删除的调压箱ID
+     * @return 结果
+     */
+    public int deleteTRegulatorBoxByIds(Long[] boxIds);
+
+    /**
+     * 删除调压箱信息
+     * 
+     * @param boxId 调压箱ID
+     * @return 结果
+     */
+    public int deleteTRegulatorBoxById(Long boxId);
+}

gassafety-system/src/main/java/com/zehong/system/service/ITValveWellService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TValveWell;
+
+/**
+ * 阀门井Service接口
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+public interface ITValveWellService 
+{
+    /**
+     * 查询阀门井
+     * 
+     * @param wellId 阀门井ID
+     * @return 阀门井
+     */
+    public TValveWell selectTValveWellById(Long wellId);
+
+    /**
+     * 查询阀门井列表
+     * 
+     * @param tValveWell 阀门井
+     * @return 阀门井集合
+     */
+    public List<TValveWell> selectTValveWellList(TValveWell tValveWell);
+
+    /**
+     * 新增阀门井
+     * 
+     * @param tValveWell 阀门井
+     * @return 结果
+     */
+    public int insertTValveWell(TValveWell tValveWell);
+
+    /**
+     * 修改阀门井
+     * 
+     * @param tValveWell 阀门井
+     * @return 结果
+     */
+    public int updateTValveWell(TValveWell tValveWell);
+
+    /**
+     * 批量删除阀门井
+     * 
+     * @param wellIds 需要删除的阀门井ID
+     * @return 结果
+     */
+    public int deleteTValveWellByIds(Long[] wellIds);
+
+    /**
+     * 删除阀门井信息
+     * 
+     * @param wellId 阀门井ID
+     * @return 结果
+     */
+    public int deleteTValveWellById(Long wellId);
+}

gassafety-system/src/main/java/com/zehong/system/service/impl/TFlowmeterServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TFlowmeterMapper;
+import com.zehong.system.domain.TFlowmeter;
+import com.zehong.system.service.ITFlowmeterService;
+
+/**
+ * 流量计Service业务层处理
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+@Service
+public class TFlowmeterServiceImpl implements ITFlowmeterService 
+{
+    @Autowired
+    private TFlowmeterMapper tFlowmeterMapper;
+
+    /**
+     * 查询流量计
+     * 
+     * @param flowmeterId 流量计ID
+     * @return 流量计
+     */
+    @Override
+    public TFlowmeter selectTFlowmeterById(Long flowmeterId)
+    {
+        return tFlowmeterMapper.selectTFlowmeterById(flowmeterId);
+    }
+
+    /**
+     * 查询流量计列表
+     * 
+     * @param tFlowmeter 流量计
+     * @return 流量计
+     */
+    @Override
+    public List<TFlowmeter> selectTFlowmeterList(TFlowmeter tFlowmeter)
+    {
+        return tFlowmeterMapper.selectTFlowmeterList(tFlowmeter);
+    }
+
+    /**
+     * 新增流量计
+     * 
+     * @param tFlowmeter 流量计
+     * @return 结果
+     */
+    @Override
+    public int insertTFlowmeter(TFlowmeter tFlowmeter)
+    {
+        return tFlowmeterMapper.insertTFlowmeter(tFlowmeter);
+    }
+
+    /**
+     * 修改流量计
+     * 
+     * @param tFlowmeter 流量计
+     * @return 结果
+     */
+    @Override
+    public int updateTFlowmeter(TFlowmeter tFlowmeter)
+    {
+        return tFlowmeterMapper.updateTFlowmeter(tFlowmeter);
+    }
+
+    /**
+     * 批量删除流量计
+     * 
+     * @param flowmeterIds 需要删除的流量计ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTFlowmeterByIds(Long[] flowmeterIds)
+    {
+        return tFlowmeterMapper.deleteTFlowmeterByIds(flowmeterIds);
+    }
+
+    /**
+     * 删除流量计信息
+     * 
+     * @param flowmeterId 流量计ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTFlowmeterById(Long flowmeterId)
+    {
+        return tFlowmeterMapper.deleteTFlowmeterById(flowmeterId);
+    }
+}

gassafety-system/src/main/java/com/zehong/system/service/impl/TGasMeterServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TGasMeterMapper;
+import com.zehong.system.domain.TGasMeter;
+import com.zehong.system.service.ITGasMeterService;
+
+/**
+ * 物联网燃气表Service业务层处理
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+@Service
+public class TGasMeterServiceImpl implements ITGasMeterService 
+{
+    @Autowired
+    private TGasMeterMapper tGasMeterMapper;
+
+    /**
+     * 查询物联网燃气表
+     * 
+     * @param gasId 物联网燃气表ID
+     * @return 物联网燃气表
+     */
+    @Override
+    public TGasMeter selectTGasMeterById(Long gasId)
+    {
+        return tGasMeterMapper.selectTGasMeterById(gasId);
+    }
+
+    /**
+     * 查询物联网燃气表列表
+     * 
+     * @param tGasMeter 物联网燃气表
+     * @return 物联网燃气表
+     */
+    @Override
+    public List<TGasMeter> selectTGasMeterList(TGasMeter tGasMeter)
+    {
+        return tGasMeterMapper.selectTGasMeterList(tGasMeter);
+    }
+
+    /**
+     * 新增物联网燃气表
+     * 
+     * @param tGasMeter 物联网燃气表
+     * @return 结果
+     */
+    @Override
+    public int insertTGasMeter(TGasMeter tGasMeter)
+    {
+        return tGasMeterMapper.insertTGasMeter(tGasMeter);
+    }
+
+    /**
+     * 修改物联网燃气表
+     * 
+     * @param tGasMeter 物联网燃气表
+     * @return 结果
+     */
+    @Override
+    public int updateTGasMeter(TGasMeter tGasMeter)
+    {
+        return tGasMeterMapper.updateTGasMeter(tGasMeter);
+    }
+
+    /**
+     * 批量删除物联网燃气表
+     * 
+     * @param gasIds 需要删除的物联网燃气表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTGasMeterByIds(Long[] gasIds)
+    {
+        return tGasMeterMapper.deleteTGasMeterByIds(gasIds);
+    }
+
+    /**
+     * 删除物联网燃气表信息
+     * 
+     * @param gasId 物联网燃气表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTGasMeterById(Long gasId)
+    {
+        return tGasMeterMapper.deleteTGasMeterById(gasId);
+    }
+}

gassafety-system/src/main/java/com/zehong/system/service/impl/TInspectorServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TInspectorMapper;
+import com.zehong.system.domain.TInspector;
+import com.zehong.system.service.ITInspectorService;
+
+/**
+ * 巡检员Service业务层处理
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+@Service
+public class TInspectorServiceImpl implements ITInspectorService 
+{
+    @Autowired
+    private TInspectorMapper tInspectorMapper;
+
+    /**
+     * 查询巡检员
+     * 
+     * @param inspectorId 巡检员ID
+     * @return 巡检员
+     */
+    @Override
+    public TInspector selectTInspectorById(Long inspectorId)
+    {
+        return tInspectorMapper.selectTInspectorById(inspectorId);
+    }
+
+    /**
+     * 查询巡检员列表
+     * 
+     * @param tInspector 巡检员
+     * @return 巡检员
+     */
+    @Override
+    public List<TInspector> selectTInspectorList(TInspector tInspector)
+    {
+        return tInspectorMapper.selectTInspectorList(tInspector);
+    }
+
+    /**
+     * 新增巡检员
+     * 
+     * @param tInspector 巡检员
+     * @return 结果
+     */
+    @Override
+    public int insertTInspector(TInspector tInspector)
+    {
+        return tInspectorMapper.insertTInspector(tInspector);
+    }
+
+    /**
+     * 修改巡检员
+     * 
+     * @param tInspector 巡检员
+     * @return 结果
+     */
+    @Override
+    public int updateTInspector(TInspector tInspector)
+    {
+        return tInspectorMapper.updateTInspector(tInspector);
+    }
+
+    /**
+     * 批量删除巡检员
+     * 
+     * @param inspectorIds 需要删除的巡检员ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTInspectorByIds(Long[] inspectorIds)
+    {
+        return tInspectorMapper.deleteTInspectorByIds(inspectorIds);
+    }
+
+    /**
+     * 删除巡检员信息
+     * 
+     * @param inspectorId 巡检员ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTInspectorById(Long inspectorId)
+    {
+        return tInspectorMapper.deleteTInspectorById(inspectorId);
+    }
+}

gassafety-system/src/main/java/com/zehong/system/service/impl/TPipeServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TPipeMapper;
+import com.zehong.system.domain.TPipe;
+import com.zehong.system.service.ITPipeService;
+
+/**
+ * 管道信息Service业务层处理
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+@Service
+public class TPipeServiceImpl implements ITPipeService 
+{
+    @Autowired
+    private TPipeMapper tPipeMapper;
+
+    /**
+     * 查询管道信息
+     * 
+     * @param pipeId 管道信息ID
+     * @return 管道信息
+     */
+    @Override
+    public TPipe selectTPipeById(Long pipeId)
+    {
+        return tPipeMapper.selectTPipeById(pipeId);
+    }
+
+    /**
+     * 查询管道信息列表
+     * 
+     * @param tPipe 管道信息
+     * @return 管道信息
+     */
+    @Override
+    public List<TPipe> selectTPipeList(TPipe tPipe)
+    {
+        return tPipeMapper.selectTPipeList(tPipe);
+    }
+
+    /**
+     * 新增管道信息
+     * 
+     * @param tPipe 管道信息
+     * @return 结果
+     */
+    @Override
+    public int insertTPipe(TPipe tPipe)
+    {
+        return tPipeMapper.insertTPipe(tPipe);
+    }
+
+    /**
+     * 修改管道信息
+     * 
+     * @param tPipe 管道信息
+     * @return 结果
+     */
+    @Override
+    public int updateTPipe(TPipe tPipe)
+    {
+        return tPipeMapper.updateTPipe(tPipe);
+    }
+
+    /**
+     * 批量删除管道信息
+     * 
+     * @param pipeIds 需要删除的管道信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPipeByIds(Long[] pipeIds)
+    {
+        return tPipeMapper.deleteTPipeByIds(pipeIds);
+    }
+
+    /**
+     * 删除管道信息信息
+     * 
+     * @param pipeId 管道信息ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTPipeById(Long pipeId)
+    {
+        return tPipeMapper.deleteTPipeById(pipeId);
+    }
+}

gassafety-system/src/main/java/com/zehong/system/service/impl/TRegulatorBoxServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TRegulatorBoxMapper;
+import com.zehong.system.domain.TRegulatorBox;
+import com.zehong.system.service.ITRegulatorBoxService;
+
+/**
+ * 调压箱Service业务层处理
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+@Service
+public class TRegulatorBoxServiceImpl implements ITRegulatorBoxService 
+{
+    @Autowired
+    private TRegulatorBoxMapper tRegulatorBoxMapper;
+
+    /**
+     * 查询调压箱
+     * 
+     * @param boxId 调压箱ID
+     * @return 调压箱
+     */
+    @Override
+    public TRegulatorBox selectTRegulatorBoxById(Long boxId)
+    {
+        return tRegulatorBoxMapper.selectTRegulatorBoxById(boxId);
+    }
+
+    /**
+     * 查询调压箱列表
+     * 
+     * @param tRegulatorBox 调压箱
+     * @return 调压箱
+     */
+    @Override
+    public List<TRegulatorBox> selectTRegulatorBoxList(TRegulatorBox tRegulatorBox)
+    {
+        return tRegulatorBoxMapper.selectTRegulatorBoxList(tRegulatorBox);
+    }
+
+    /**
+     * 新增调压箱
+     * 
+     * @param tRegulatorBox 调压箱
+     * @return 结果
+     */
+    @Override
+    public int insertTRegulatorBox(TRegulatorBox tRegulatorBox)
+    {
+        return tRegulatorBoxMapper.insertTRegulatorBox(tRegulatorBox);
+    }
+
+    /**
+     * 修改调压箱
+     * 
+     * @param tRegulatorBox 调压箱
+     * @return 结果
+     */
+    @Override
+    public int updateTRegulatorBox(TRegulatorBox tRegulatorBox)
+    {
+        return tRegulatorBoxMapper.updateTRegulatorBox(tRegulatorBox);
+    }
+
+    /**
+     * 批量删除调压箱
+     * 
+     * @param boxIds 需要删除的调压箱ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTRegulatorBoxByIds(Long[] boxIds)
+    {
+        return tRegulatorBoxMapper.deleteTRegulatorBoxByIds(boxIds);
+    }
+
+    /**
+     * 删除调压箱信息
+     * 
+     * @param boxId 调压箱ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTRegulatorBoxById(Long boxId)
+    {
+        return tRegulatorBoxMapper.deleteTRegulatorBoxById(boxId);
+    }
+}

gassafety-system/src/main/java/com/zehong/system/service/impl/TValveWellServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TValveWellMapper;
+import com.zehong.system.domain.TValveWell;
+import com.zehong.system.service.ITValveWellService;
+
+/**
+ * 阀门井Service业务层处理
+ * 
+ * @author zehong
+ * @date 2021-07-08
+ */
+@Service
+public class TValveWellServiceImpl implements ITValveWellService 
+{
+    @Autowired
+    private TValveWellMapper tValveWellMapper;
+
+    /**
+     * 查询阀门井
+     * 
+     * @param wellId 阀门井ID
+     * @return 阀门井
+     */
+    @Override
+    public TValveWell selectTValveWellById(Long wellId)
+    {
+        return tValveWellMapper.selectTValveWellById(wellId);
+    }
+
+    /**
+     * 查询阀门井列表
+     * 
+     * @param tValveWell 阀门井
+     * @return 阀门井
+     */
+    @Override
+    public List<TValveWell> selectTValveWellList(TValveWell tValveWell)
+    {
+        return tValveWellMapper.selectTValveWellList(tValveWell);
+    }
+
+    /**
+     * 新增阀门井
+     * 
+     * @param tValveWell 阀门井
+     * @return 结果
+     */
+    @Override
+    public int insertTValveWell(TValveWell tValveWell)
+    {
+        return tValveWellMapper.insertTValveWell(tValveWell);
+    }
+
+    /**
+     * 修改阀门井
+     * 
+     * @param tValveWell 阀门井
+     * @return 结果
+     */
+    @Override
+    public int updateTValveWell(TValveWell tValveWell)
+    {
+        return tValveWellMapper.updateTValveWell(tValveWell);
+    }
+
+    /**
+     * 批量删除阀门井
+     * 
+     * @param wellIds 需要删除的阀门井ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTValveWellByIds(Long[] wellIds)
+    {
+        return tValveWellMapper.deleteTValveWellByIds(wellIds);
+    }
+
+    /**
+     * 删除阀门井信息
+     * 
+     * @param wellId 阀门井ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTValveWellById(Long wellId)
+    {
+        return tValveWellMapper.deleteTValveWellById(wellId);
+    }
+}

gassafety-system/src/main/resources/mapper/system/TEnterpriseInfoMapper.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.TEnterpriseInfoMapper">
+    
+    <resultMap type="TEnterpriseInfo" id="TEnterpriseInfoResult">
+        <result property="infoId"    column="info_id"    />
+        <result property="unitName"    column="unit_name"    />
+        <result property="orgCode"    column="org_code"    />
+        <result property="orgFilePath"    column="org_file_path"    />
+        <result property="orgFileName"    column="org_file_name"    />
+        <result property="runAddress"    column="run_address"    />
+        <result property="regAddress"    column="reg_address"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="legalPerson"    column="legal_person"    />
+        <result property="legalPersonPhone"    column="legal_person_phone"    />
+        <result property="legalPersonEmail"    column="legal_person_email"    />
+        <result property="createUserId"    column="create_user_id"    />
+        <result property="updateUserId"    column="update_user_id"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTEnterpriseInfoVo">
+        select info_id, unit_name, org_code, org_file_path, org_file_name, run_address, reg_address, longitude, latitude, legal_person, legal_person_phone, legal_person_email, create_user_id, update_user_id, update_time, create_time, remarks from t_enterprise_info
+    </sql>
+
+    <select id="selectTEnterpriseInfoList" parameterType="TEnterpriseInfo" resultMap="TEnterpriseInfoResult">
+        <include refid="selectTEnterpriseInfoVo"/>
+        <where>  
+            <if test="unitName != null  and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
+            <if test="orgCode != null  and orgCode != ''"> and org_code = #{orgCode}</if>
+            <if test="orgFilePath != null  and orgFilePath != ''"> and org_file_path = #{orgFilePath}</if>
+            <if test="orgFileName != null  and orgFileName != ''"> and org_file_name like concat('%', #{orgFileName}, '%')</if>
+            <if test="runAddress != null  and runAddress != ''"> and run_address = #{runAddress}</if>
+            <if test="regAddress != null  and regAddress != ''"> and reg_address = #{regAddress}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="legalPerson != null  and legalPerson != ''"> and legal_person = #{legalPerson}</if>
+            <if test="legalPersonPhone != null  and legalPersonPhone != ''"> and legal_person_phone = #{legalPersonPhone}</if>
+            <if test="legalPersonEmail != null  and legalPersonEmail != ''"> and legal_person_email = #{legalPersonEmail}</if>
+            <if test="createUserId != null  and createUserId != ''"> and create_user_id = #{createUserId}</if>
+            <if test="updateUserId != null  and updateUserId != ''"> and update_user_id = #{updateUserId}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTEnterpriseInfoById" parameterType="Long" resultMap="TEnterpriseInfoResult">
+        <include refid="selectTEnterpriseInfoVo"/>
+        where info_id = #{infoId}
+    </select>
+        
+    <insert id="insertTEnterpriseInfo" parameterType="TEnterpriseInfo">
+        insert into t_enterprise_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="infoId != null">info_id,</if>
+            <if test="unitName != null">unit_name,</if>
+            <if test="orgCode != null">org_code,</if>
+            <if test="orgFilePath != null">org_file_path,</if>
+            <if test="orgFileName != null">org_file_name,</if>
+            <if test="runAddress != null">run_address,</if>
+            <if test="regAddress != null">reg_address,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="legalPerson != null">legal_person,</if>
+            <if test="legalPersonPhone != null">legal_person_phone,</if>
+            <if test="legalPersonEmail != null">legal_person_email,</if>
+            <if test="createUserId != null">create_user_id,</if>
+            <if test="updateUserId != null">update_user_id,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="infoId != null">#{infoId},</if>
+            <if test="unitName != null">#{unitName},</if>
+            <if test="orgCode != null">#{orgCode},</if>
+            <if test="orgFilePath != null">#{orgFilePath},</if>
+            <if test="orgFileName != null">#{orgFileName},</if>
+            <if test="runAddress != null">#{runAddress},</if>
+            <if test="regAddress != null">#{regAddress},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="legalPerson != null">#{legalPerson},</if>
+            <if test="legalPersonPhone != null">#{legalPersonPhone},</if>
+            <if test="legalPersonEmail != null">#{legalPersonEmail},</if>
+            <if test="createUserId != null">#{createUserId},</if>
+            <if test="updateUserId != null">#{updateUserId},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTEnterpriseInfo" parameterType="TEnterpriseInfo">
+        update t_enterprise_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="unitName != null">unit_name = #{unitName},</if>
+            <if test="orgCode != null">org_code = #{orgCode},</if>
+            <if test="orgFilePath != null">org_file_path = #{orgFilePath},</if>
+            <if test="orgFileName != null">org_file_name = #{orgFileName},</if>
+            <if test="runAddress != null">run_address = #{runAddress},</if>
+            <if test="regAddress != null">reg_address = #{regAddress},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="legalPerson != null">legal_person = #{legalPerson},</if>
+            <if test="legalPersonPhone != null">legal_person_phone = #{legalPersonPhone},</if>
+            <if test="legalPersonEmail != null">legal_person_email = #{legalPersonEmail},</if>
+            <if test="createUserId != null">create_user_id = #{createUserId},</if>
+            <if test="updateUserId != null">update_user_id = #{updateUserId},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where info_id = #{infoId}
+    </update>
+
+    <delete id="deleteTEnterpriseInfoById" parameterType="Long">
+        delete from t_enterprise_info where info_id = #{infoId}
+    </delete>
+
+    <delete id="deleteTEnterpriseInfoByIds" parameterType="String">
+        delete from t_enterprise_info where info_id in 
+        <foreach item="infoId" collection="array" open="(" separator="," close=")">
+            #{infoId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafety-system/src/main/resources/mapper/system/TFlowmeterMapper.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.TFlowmeterMapper">
+    
+    <resultMap type="TFlowmeter" id="TFlowmeterResult">
+        <result property="flowmeterId"    column="flowmeter_id"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="pipeId"    column="pipe_id"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="deviceAddr"    column="device_addr"    />
+        <result property="deviceModel"    column="device_model"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="iotNo"    column="iot_no"    />
+        <result property="iconUrl"    column="icon_url"    />
+        <result property="linkman"    column="linkman"    />
+        <result property="phone"    column="phone"    />
+        <result property="installationTime"    column="installation_time"    />
+        <result property="inspectionTime"    column="inspection_time"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTFlowmeterVo">
+        select flowmeter_id, enterprise_id, pipe_id, device_name, device_addr, device_model, longitude, latitude, iot_no, icon_url, linkman, phone, installation_time, inspection_time, remarks from t_flowmeter
+    </sql>
+
+    <select id="selectTFlowmeterList" parameterType="TFlowmeter" resultMap="TFlowmeterResult">
+        <include refid="selectTFlowmeterVo"/>
+        <where>  
+            <if test="enterpriseId != null "> and enterprise_id = #{enterpriseId}</if>
+            <if test="pipeId != null "> and pipe_id = #{pipeId}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceAddr != null  and deviceAddr != ''"> and device_addr = #{deviceAddr}</if>
+            <if test="deviceModel != null  and deviceModel != ''"> and device_model = #{deviceModel}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="iotNo != null  and iotNo != ''"> and iot_no = #{iotNo}</if>
+            <if test="iconUrl != null  and iconUrl != ''"> and icon_url = #{iconUrl}</if>
+            <if test="linkman != null  and linkman != ''"> and linkman = #{linkman}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="installationTime != null "> and installation_time = #{installationTime}</if>
+            <if test="inspectionTime != null "> and inspection_time = #{inspectionTime}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTFlowmeterById" parameterType="Long" resultMap="TFlowmeterResult">
+        <include refid="selectTFlowmeterVo"/>
+        where flowmeter_id = #{flowmeterId}
+    </select>
+        
+    <insert id="insertTFlowmeter" parameterType="TFlowmeter" useGeneratedKeys="true" keyProperty="flowmeterId">
+        insert into t_flowmeter
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id,</if>
+            <if test="pipeId != null">pipe_id,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="deviceAddr != null">device_addr,</if>
+            <if test="deviceModel != null">device_model,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="iotNo != null">iot_no,</if>
+            <if test="iconUrl != null">icon_url,</if>
+            <if test="linkman != null">linkman,</if>
+            <if test="phone != null">phone,</if>
+            <if test="installationTime != null">installation_time,</if>
+            <if test="inspectionTime != null">inspection_time,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">#{enterpriseId},</if>
+            <if test="pipeId != null">#{pipeId},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="deviceAddr != null">#{deviceAddr},</if>
+            <if test="deviceModel != null">#{deviceModel},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="iotNo != null">#{iotNo},</if>
+            <if test="iconUrl != null">#{iconUrl},</if>
+            <if test="linkman != null">#{linkman},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="installationTime != null">#{installationTime},</if>
+            <if test="inspectionTime != null">#{inspectionTime},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTFlowmeter" parameterType="TFlowmeter">
+        update t_flowmeter
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
+            <if test="pipeId != null">pipe_id = #{pipeId},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="deviceAddr != null">device_addr = #{deviceAddr},</if>
+            <if test="deviceModel != null">device_model = #{deviceModel},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="iotNo != null">iot_no = #{iotNo},</if>
+            <if test="iconUrl != null">icon_url = #{iconUrl},</if>
+            <if test="linkman != null">linkman = #{linkman},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="installationTime != null">installation_time = #{installationTime},</if>
+            <if test="inspectionTime != null">inspection_time = #{inspectionTime},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where flowmeter_id = #{flowmeterId}
+    </update>
+
+    <delete id="deleteTFlowmeterById" parameterType="Long">
+        delete from t_flowmeter where flowmeter_id = #{flowmeterId}
+    </delete>
+
+    <delete id="deleteTFlowmeterByIds" parameterType="String">
+        delete from t_flowmeter where flowmeter_id in 
+        <foreach item="flowmeterId" collection="array" open="(" separator="," close=")">
+            #{flowmeterId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafety-system/src/main/resources/mapper/system/TGasMeterMapper.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.TGasMeterMapper">
+    
+    <resultMap type="TGasMeter" id="TGasMeterResult">
+        <result property="gasId"    column="gas_id"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="pipeId"    column="pipe_id"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="deviceAddr"    column="device_addr"    />
+        <result property="deviceModel"    column="device_model"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="iotNo"    column="iot_no"    />
+        <result property="iconUrl"    column="icon_url"    />
+        <result property="linkman"    column="linkman"    />
+        <result property="phone"    column="phone"    />
+        <result property="installationTime"    column="installation_time"    />
+        <result property="inspectionTime"    column="inspection_time"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTGasMeterVo">
+        select gas_id, enterprise_id, pipe_id, device_name, device_addr, device_model, longitude, latitude, iot_no, icon_url, linkman, phone, installation_time, inspection_time, remarks from t_gas_meter
+    </sql>
+
+    <select id="selectTGasMeterList" parameterType="TGasMeter" resultMap="TGasMeterResult">
+        <include refid="selectTGasMeterVo"/>
+        <where>  
+            <if test="enterpriseId != null "> and enterprise_id = #{enterpriseId}</if>
+            <if test="pipeId != null "> and pipe_id = #{pipeId}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceAddr != null  and deviceAddr != ''"> and device_addr = #{deviceAddr}</if>
+            <if test="deviceModel != null  and deviceModel != ''"> and device_model = #{deviceModel}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="iotNo != null  and iotNo != ''"> and iot_no = #{iotNo}</if>
+            <if test="iconUrl != null  and iconUrl != ''"> and icon_url = #{iconUrl}</if>
+            <if test="linkman != null  and linkman != ''"> and linkman = #{linkman}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="installationTime != null "> and installation_time = #{installationTime}</if>
+            <if test="inspectionTime != null "> and inspection_time = #{inspectionTime}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTGasMeterById" parameterType="Long" resultMap="TGasMeterResult">
+        <include refid="selectTGasMeterVo"/>
+        where gas_id = #{gasId}
+    </select>
+        
+    <insert id="insertTGasMeter" parameterType="TGasMeter" useGeneratedKeys="true" keyProperty="gasId">
+        insert into t_gas_meter
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id,</if>
+            <if test="pipeId != null">pipe_id,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="deviceAddr != null">device_addr,</if>
+            <if test="deviceModel != null">device_model,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="iotNo != null">iot_no,</if>
+            <if test="iconUrl != null">icon_url,</if>
+            <if test="linkman != null">linkman,</if>
+            <if test="phone != null">phone,</if>
+            <if test="installationTime != null">installation_time,</if>
+            <if test="inspectionTime != null">inspection_time,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">#{enterpriseId},</if>
+            <if test="pipeId != null">#{pipeId},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="deviceAddr != null">#{deviceAddr},</if>
+            <if test="deviceModel != null">#{deviceModel},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="iotNo != null">#{iotNo},</if>
+            <if test="iconUrl != null">#{iconUrl},</if>
+            <if test="linkman != null">#{linkman},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="installationTime != null">#{installationTime},</if>
+            <if test="inspectionTime != null">#{inspectionTime},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTGasMeter" parameterType="TGasMeter">
+        update t_gas_meter
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
+            <if test="pipeId != null">pipe_id = #{pipeId},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="deviceAddr != null">device_addr = #{deviceAddr},</if>
+            <if test="deviceModel != null">device_model = #{deviceModel},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="iotNo != null">iot_no = #{iotNo},</if>
+            <if test="iconUrl != null">icon_url = #{iconUrl},</if>
+            <if test="linkman != null">linkman = #{linkman},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="installationTime != null">installation_time = #{installationTime},</if>
+            <if test="inspectionTime != null">inspection_time = #{inspectionTime},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where gas_id = #{gasId}
+    </update>
+
+    <delete id="deleteTGasMeterById" parameterType="Long">
+        delete from t_gas_meter where gas_id = #{gasId}
+    </delete>
+
+    <delete id="deleteTGasMeterByIds" parameterType="String">
+        delete from t_gas_meter where gas_id in 
+        <foreach item="gasId" collection="array" open="(" separator="," close=")">
+            #{gasId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafety-system/src/main/resources/mapper/system/TInspectorMapper.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.TInspectorMapper">
+    
+    <resultMap type="TInspector" id="TInspectorResult">
+        <result property="inspectorId"    column="inspector_id"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="name"    column="name"    />
+        <result property="phone"    column="phone"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTInspectorVo">
+        select inspector_id, enterprise_id, name, phone, remarks from t_inspector
+    </sql>
+
+    <select id="selectTInspectorList" parameterType="TInspector" resultMap="TInspectorResult">
+        <include refid="selectTInspectorVo"/>
+        <where>  
+            <if test="enterpriseId != null "> and enterprise_id = #{enterpriseId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTInspectorById" parameterType="Long" resultMap="TInspectorResult">
+        <include refid="selectTInspectorVo"/>
+        where inspector_id = #{inspectorId}
+    </select>
+        
+    <insert id="insertTInspector" parameterType="TInspector" useGeneratedKeys="true" keyProperty="inspectorId">
+        insert into t_inspector
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id,</if>
+            <if test="name != null">name,</if>
+            <if test="phone != null">phone,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">#{enterpriseId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTInspector" parameterType="TInspector">
+        update t_inspector
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where inspector_id = #{inspectorId}
+    </update>
+
+    <delete id="deleteTInspectorById" parameterType="Long">
+        delete from t_inspector where inspector_id = #{inspectorId}
+    </delete>
+
+    <delete id="deleteTInspectorByIds" parameterType="String">
+        delete from t_inspector where inspector_id in 
+        <foreach item="inspectorId" collection="array" open="(" separator="," close=")">
+            #{inspectorId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafety-system/src/main/resources/mapper/system/TPipeMapper.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.TPipeMapper">
+    
+    <resultMap type="TPipe" id="TPipeResult">
+        <result property="pipeId"    column="pipe_id"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="pipeName"    column="pipe_name"    />
+        <result property="pipeAddr"    column="pipe_addr"    />
+        <result property="coordinates"    column="coordinates"    />
+        <result property="pipeLength"    column="pipe_length"    />
+        <result property="pipeType"    column="pipe_type"    />
+        <result property="pipePressure"    column="pipe_pressure"    />
+        <result property="iconUrl"    column="icon_url"    />
+        <result property="installationTime"    column="installation_time"    />
+        <result property="inspectionTime"    column="inspection_time"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTPipeVo">
+        select pipe_id, enterprise_id, pipe_name, pipe_addr, coordinates, pipe_length, pipe_type, pipe_pressure, icon_url, installation_time, inspection_time, remarks from t_pipe
+    </sql>
+
+    <select id="selectTPipeList" parameterType="TPipe" resultMap="TPipeResult">
+        <include refid="selectTPipeVo"/>
+        <where>  
+            <if test="enterpriseId != null "> and enterprise_id = #{enterpriseId}</if>
+            <if test="pipeName != null  and pipeName != ''"> and pipe_name like concat('%', #{pipeName}, '%')</if>
+            <if test="pipeAddr != null  and pipeAddr != ''"> and pipe_addr = #{pipeAddr}</if>
+            <if test="coordinates != null  and coordinates != ''"> and coordinates = #{coordinates}</if>
+            <if test="pipeLength != null "> and pipe_length = #{pipeLength}</if>
+            <if test="pipeType != null  and pipeType != ''"> and pipe_type = #{pipeType}</if>
+            <if test="pipePressure != null  and pipePressure != ''"> and pipe_pressure = #{pipePressure}</if>
+            <if test="iconUrl != null  and iconUrl != ''"> and icon_url = #{iconUrl}</if>
+            <if test="installationTime != null "> and installation_time = #{installationTime}</if>
+            <if test="inspectionTime != null "> and inspection_time = #{inspectionTime}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTPipeById" parameterType="Long" resultMap="TPipeResult">
+        <include refid="selectTPipeVo"/>
+        where pipe_id = #{pipeId}
+    </select>
+        
+    <insert id="insertTPipe" parameterType="TPipe" useGeneratedKeys="true" keyProperty="pipeId">
+        insert into t_pipe
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id,</if>
+            <if test="pipeName != null">pipe_name,</if>
+            <if test="pipeAddr != null">pipe_addr,</if>
+            <if test="coordinates != null">coordinates,</if>
+            <if test="pipeLength != null">pipe_length,</if>
+            <if test="pipeType != null">pipe_type,</if>
+            <if test="pipePressure != null">pipe_pressure,</if>
+            <if test="iconUrl != null">icon_url,</if>
+            <if test="installationTime != null">installation_time,</if>
+            <if test="inspectionTime != null">inspection_time,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">#{enterpriseId},</if>
+            <if test="pipeName != null">#{pipeName},</if>
+            <if test="pipeAddr != null">#{pipeAddr},</if>
+            <if test="coordinates != null">#{coordinates},</if>
+            <if test="pipeLength != null">#{pipeLength},</if>
+            <if test="pipeType != null">#{pipeType},</if>
+            <if test="pipePressure != null">#{pipePressure},</if>
+            <if test="iconUrl != null">#{iconUrl},</if>
+            <if test="installationTime != null">#{installationTime},</if>
+            <if test="inspectionTime != null">#{inspectionTime},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTPipe" parameterType="TPipe">
+        update t_pipe
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
+            <if test="pipeName != null">pipe_name = #{pipeName},</if>
+            <if test="pipeAddr != null">pipe_addr = #{pipeAddr},</if>
+            <if test="coordinates != null">coordinates = #{coordinates},</if>
+            <if test="pipeLength != null">pipe_length = #{pipeLength},</if>
+            <if test="pipeType != null">pipe_type = #{pipeType},</if>
+            <if test="pipePressure != null">pipe_pressure = #{pipePressure},</if>
+            <if test="iconUrl != null">icon_url = #{iconUrl},</if>
+            <if test="installationTime != null">installation_time = #{installationTime},</if>
+            <if test="inspectionTime != null">inspection_time = #{inspectionTime},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where pipe_id = #{pipeId}
+    </update>
+
+    <delete id="deleteTPipeById" parameterType="Long">
+        delete from t_pipe where pipe_id = #{pipeId}
+    </delete>
+
+    <delete id="deleteTPipeByIds" parameterType="String">
+        delete from t_pipe where pipe_id in 
+        <foreach item="pipeId" collection="array" open="(" separator="," close=")">
+            #{pipeId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafety-system/src/main/resources/mapper/system/TRegulatorBoxMapper.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.TRegulatorBoxMapper">
+    
+    <resultMap type="TRegulatorBox" id="TRegulatorBoxResult">
+        <result property="boxId"    column="box_id"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="deviceAddr"    column="device_addr"    />
+        <result property="deviceModel"    column="device_model"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="iconUrl"    column="icon_url"    />
+        <result property="linkman"    column="linkman"    />
+        <result property="phone"    column="phone"    />
+        <result property="installationTime"    column="installation_time"    />
+        <result property="inspectionTime"    column="inspection_time"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTRegulatorBoxVo">
+        select box_id, enterprise_id, device_name, device_addr, device_model, longitude, latitude, icon_url, linkman, phone, installation_time, inspection_time, remarks from t_regulator_box
+    </sql>
+
+    <select id="selectTRegulatorBoxList" parameterType="TRegulatorBox" resultMap="TRegulatorBoxResult">
+        <include refid="selectTRegulatorBoxVo"/>
+        <where>  
+            <if test="enterpriseId != null "> and enterprise_id = #{enterpriseId}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceAddr != null  and deviceAddr != ''"> and device_addr = #{deviceAddr}</if>
+            <if test="deviceModel != null  and deviceModel != ''"> and device_model = #{deviceModel}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="iconUrl != null  and iconUrl != ''"> and icon_url = #{iconUrl}</if>
+            <if test="linkman != null  and linkman != ''"> and linkman = #{linkman}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="installationTime != null "> and installation_time = #{installationTime}</if>
+            <if test="inspectionTime != null "> and inspection_time = #{inspectionTime}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTRegulatorBoxById" parameterType="Long" resultMap="TRegulatorBoxResult">
+        <include refid="selectTRegulatorBoxVo"/>
+        where box_id = #{boxId}
+    </select>
+        
+    <insert id="insertTRegulatorBox" parameterType="TRegulatorBox" useGeneratedKeys="true" keyProperty="boxId">
+        insert into t_regulator_box
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="deviceAddr != null">device_addr,</if>
+            <if test="deviceModel != null">device_model,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="iconUrl != null">icon_url,</if>
+            <if test="linkman != null">linkman,</if>
+            <if test="phone != null">phone,</if>
+            <if test="installationTime != null">installation_time,</if>
+            <if test="inspectionTime != null">inspection_time,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">#{enterpriseId},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="deviceAddr != null">#{deviceAddr},</if>
+            <if test="deviceModel != null">#{deviceModel},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="iconUrl != null">#{iconUrl},</if>
+            <if test="linkman != null">#{linkman},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="installationTime != null">#{installationTime},</if>
+            <if test="inspectionTime != null">#{inspectionTime},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTRegulatorBox" parameterType="TRegulatorBox">
+        update t_regulator_box
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="deviceAddr != null">device_addr = #{deviceAddr},</if>
+            <if test="deviceModel != null">device_model = #{deviceModel},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="iconUrl != null">icon_url = #{iconUrl},</if>
+            <if test="linkman != null">linkman = #{linkman},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="installationTime != null">installation_time = #{installationTime},</if>
+            <if test="inspectionTime != null">inspection_time = #{inspectionTime},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where box_id = #{boxId}
+    </update>
+
+    <delete id="deleteTRegulatorBoxById" parameterType="Long">
+        delete from t_regulator_box where box_id = #{boxId}
+    </delete>
+
+    <delete id="deleteTRegulatorBoxByIds" parameterType="String">
+        delete from t_regulator_box where box_id in 
+        <foreach item="boxId" collection="array" open="(" separator="," close=")">
+            #{boxId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafety-system/src/main/resources/mapper/system/TValveWellMapper.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.TValveWellMapper">
+    
+    <resultMap type="TValveWell" id="TValveWellResult">
+        <result property="wellId"    column="well_id"    />
+        <result property="enterpriseId"    column="enterprise_id"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="deviceAddr"    column="device_addr"    />
+        <result property="deviceModel"    column="device_model"    />
+        <result property="longitude"    column="longitude"    />
+        <result property="latitude"    column="latitude"    />
+        <result property="iconUrl"    column="icon_url"    />
+        <result property="linkman"    column="linkman"    />
+        <result property="phone"    column="phone"    />
+        <result property="installationTime"    column="installation_time"    />
+        <result property="inspectionTime"    column="inspection_time"    />
+        <result property="remarks"    column="remarks"    />
+    </resultMap>
+
+    <sql id="selectTValveWellVo">
+        select well_id, enterprise_id, device_name, device_addr, device_model, longitude, latitude, icon_url, linkman, phone, installation_time, inspection_time, remarks from t_valve_well
+    </sql>
+
+    <select id="selectTValveWellList" parameterType="TValveWell" resultMap="TValveWellResult">
+        <include refid="selectTValveWellVo"/>
+        <where>  
+            <if test="enterpriseId != null "> and enterprise_id = #{enterpriseId}</if>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceAddr != null  and deviceAddr != ''"> and device_addr = #{deviceAddr}</if>
+            <if test="deviceModel != null  and deviceModel != ''"> and device_model = #{deviceModel}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="iconUrl != null  and iconUrl != ''"> and icon_url = #{iconUrl}</if>
+            <if test="linkman != null  and linkman != ''"> and linkman = #{linkman}</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="installationTime != null "> and installation_time = #{installationTime}</if>
+            <if test="inspectionTime != null "> and inspection_time = #{inspectionTime}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+        </where>
+    </select>
+    
+    <select id="selectTValveWellById" parameterType="Long" resultMap="TValveWellResult">
+        <include refid="selectTValveWellVo"/>
+        where well_id = #{wellId}
+    </select>
+        
+    <insert id="insertTValveWell" parameterType="TValveWell" useGeneratedKeys="true" keyProperty="wellId">
+        insert into t_valve_well
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="deviceAddr != null">device_addr,</if>
+            <if test="deviceModel != null">device_model,</if>
+            <if test="longitude != null">longitude,</if>
+            <if test="latitude != null">latitude,</if>
+            <if test="iconUrl != null">icon_url,</if>
+            <if test="linkman != null">linkman,</if>
+            <if test="phone != null">phone,</if>
+            <if test="installationTime != null">installation_time,</if>
+            <if test="inspectionTime != null">inspection_time,</if>
+            <if test="remarks != null">remarks,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="enterpriseId != null">#{enterpriseId},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="deviceAddr != null">#{deviceAddr},</if>
+            <if test="deviceModel != null">#{deviceModel},</if>
+            <if test="longitude != null">#{longitude},</if>
+            <if test="latitude != null">#{latitude},</if>
+            <if test="iconUrl != null">#{iconUrl},</if>
+            <if test="linkman != null">#{linkman},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="installationTime != null">#{installationTime},</if>
+            <if test="inspectionTime != null">#{inspectionTime},</if>
+            <if test="remarks != null">#{remarks},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTValveWell" parameterType="TValveWell">
+        update t_valve_well
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="enterpriseId != null">enterprise_id = #{enterpriseId},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="deviceAddr != null">device_addr = #{deviceAddr},</if>
+            <if test="deviceModel != null">device_model = #{deviceModel},</if>
+            <if test="longitude != null">longitude = #{longitude},</if>
+            <if test="latitude != null">latitude = #{latitude},</if>
+            <if test="iconUrl != null">icon_url = #{iconUrl},</if>
+            <if test="linkman != null">linkman = #{linkman},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="installationTime != null">installation_time = #{installationTime},</if>
+            <if test="inspectionTime != null">inspection_time = #{inspectionTime},</if>
+            <if test="remarks != null">remarks = #{remarks},</if>
+        </trim>
+        where well_id = #{wellId}
+    </update>
+
+    <delete id="deleteTValveWellById" parameterType="Long">
+        delete from t_valve_well where well_id = #{wellId}
+    </delete>
+
+    <delete id="deleteTValveWellByIds" parameterType="String">
+        delete from t_valve_well where well_id in 
+        <foreach item="wellId" collection="array" open="(" separator="," close=")">
+            #{wellId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

gassafety-web/src/api/system/flowmeter.js

+import request from '@/utils/request'
+
+// 查询流量计列表
+export function listFlowmeter(query) {
+  return request({
+    url: '/system/flowmeter/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询流量计详细
+export function getFlowmeter(flowmeterId) {
+  return request({
+    url: '/system/flowmeter/' + flowmeterId,
+    method: 'get'
+  })
+}
+
+// 新增流量计
+export function addFlowmeter(data) {
+  return request({
+    url: '/system/flowmeter',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改流量计
+export function updateFlowmeter(data) {
+  return request({
+    url: '/system/flowmeter',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除流量计
+export function delFlowmeter(flowmeterId) {
+  return request({
+    url: '/system/flowmeter/' + flowmeterId,
+    method: 'delete'
+  })
+}
+
+// 导出流量计
+export function exportFlowmeter(query) {
+  return request({
+    url: '/system/flowmeter/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

gassafety-web/src/api/system/gasMeter.js

+import request from '@/utils/request'
+
+// 查询物联网燃气表列表
+export function listGasMeter(query) {
+  return request({
+    url: '/system/gasMeter/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询物联网燃气表详细
+export function getGasMeter(gasId) {
+  return request({
+    url: '/system/gasMeter/' + gasId,
+    method: 'get'
+  })
+}
+
+// 新增物联网燃气表
+export function addGasMeter(data) {
+  return request({
+    url: '/system/gasMeter',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改物联网燃气表
+export function updateGasMeter(data) {
+  return request({
+    url: '/system/gasMeter',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除物联网燃气表
+export function delGasMeter(gasId) {
+  return request({
+    url: '/system/gasMeter/' + gasId,
+    method: 'delete'
+  })
+}
+
+// 导出物联网燃气表
+export function exportGasMeter(query) {
+  return request({
+    url: '/system/gasMeter/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

gassafety-web/src/api/system/inspector.js

+import request from '@/utils/request'
+
+// 查询巡检员列表
+export function listInspector(query) {
+  return request({
+    url: '/system/inspector/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询巡检员详细
+export function getInspector(inspectorId) {
+  return request({
+    url: '/system/inspector/' + inspectorId,
+    method: 'get'
+  })
+}
+
+// 新增巡检员
+export function addInspector(data) {
+  return request({
+    url: '/system/inspector',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改巡检员
+export function updateInspector(data) {
+  return request({
+    url: '/system/inspector',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除巡检员
+export function delInspector(inspectorId) {
+  return request({
+    url: '/system/inspector/' + inspectorId,
+    method: 'delete'
+  })
+}
+
+// 导出巡检员
+export function exportInspector(query) {
+  return request({
+    url: '/system/inspector/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

gassafety-web/src/api/system/pipe.js

+import request from '@/utils/request'
+
+// 查询管道信息列表
+export function listPipe(query) {
+  return request({
+    url: '/system/pipe/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询管道信息详细
+export function getPipe(pipeId) {
+  return request({
+    url: '/system/pipe/' + pipeId,
+    method: 'get'
+  })
+}
+
+// 新增管道信息
+export function addPipe(data) {
+  return request({
+    url: '/system/pipe',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改管道信息
+export function updatePipe(data) {
+  return request({
+    url: '/system/pipe',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除管道信息
+export function delPipe(pipeId) {
+  return request({
+    url: '/system/pipe/' + pipeId,
+    method: 'delete'
+  })
+}
+
+// 导出管道信息
+export function exportPipe(query) {
+  return request({
+    url: '/system/pipe/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

gassafety-web/src/api/system/regulatorBox.js

+import request from '@/utils/request'
+
+// 查询调压箱列表
+export function listRegulatorBox(query) {
+  return request({
+    url: '/system/regulatorBox/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询调压箱详细
+export function getRegulatorBox(boxId) {
+  return request({
+    url: '/system/regulatorBox/' + boxId,
+    method: 'get'
+  })
+}
+
+// 新增调压箱
+export function addRegulatorBox(data) {
+  return request({
+    url: '/system/regulatorBox',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改调压箱
+export function updateRegulatorBox(data) {
+  return request({
+    url: '/system/regulatorBox',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除调压箱
+export function delRegulatorBox(boxId) {
+  return request({
+    url: '/system/regulatorBox/' + boxId,
+    method: 'delete'
+  })
+}
+
+// 导出调压箱
+export function exportRegulatorBox(query) {
+  return request({
+    url: '/system/regulatorBox/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

gassafety-web/src/api/system/valveWell.js

+import request from '@/utils/request'
+
+// 查询阀门井列表
+export function listValveWell(query) {
+  return request({
+    url: '/system/valveWell/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询阀门井详细
+export function getValveWell(wellId) {
+  return request({
+    url: '/system/valveWell/' + wellId,
+    method: 'get'
+  })
+}
+
+// 新增阀门井
+export function addValveWell(data) {
+  return request({
+    url: '/system/valveWell',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改阀门井
+export function updateValveWell(data) {
+  return request({
+    url: '/system/valveWell',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除阀门井
+export function delValveWell(wellId) {
+  return request({
+    url: '/system/valveWell/' + wellId,
+    method: 'delete'
+  })
+}
+
+// 导出阀门井
+export function exportValveWell(query) {
+  return request({
+    url: '/system/valveWell/export',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

gassafety-web/src/components/FileUpload/index.vue

@@ -3,12 +3,12 @@
     <el-upload
       :action="uploadFileUrl"
       :before-upload="handleBeforeUpload"
-      :file-list="fileList"
+      :file-list="fileArr"
       :limit="1"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
       :on-success="handleUploadSuccess"
-      :show-file-list="false"
+      :show-file-list="true"
       :headers="headers"
       class="upload-file-uploader"
       ref="upload"
@@ -50,15 +50,19 @@ export default {
       type: Number,
       default: 5,
     },
+    fileArr: {
+      type: Array,
+      default: [],
+    },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "txt", "pdf"],
+      default: () => ["doc", "xls", "ppt", "txt", "pdf",'png', 'jpg', 'jpeg'],
     },
     // 是否显示提示
     isShowTip: {
       type: Boolean,
-      default: true
+      default: false
     }
   },
   data() {
@@ -135,12 +139,26 @@ export default {
     // 上传成功回调
     handleUploadSuccess(res, file) {
       this.$message.success("上传成功");
-      this.$emit("input", res.url);
+      this.$emit("resFun", res);
     },
     // 删除文件
     handleDelete(index) {
       this.fileList.splice(index, 1);
       this.$emit("input", '');
+      // let that = this,
+      //   param;
+      // param = file.response ? file.response.fileName.replace(/\\/g, "%")
+      //   : file.response.url.replace(/\\/g, "%").slice(9);
+      // $.ajax({
+      //   type: "GET",
+      //   url: process.env.VUE_APP_BASE_API + "/common/deleteFile",
+      //   data: {savePath: param},
+      //   dataType: "json",
+      //   success: function(data){
+      //     if (data) that.$message.success("删除成功");
+      //     else return false;
+      //   }
+      // });
     },
     // 获取文件名称
     getFileName(name) {
@@ -152,7 +170,7 @@ export default {
     }
   },
   created() {
-    this.fileList = this.list;
+    // this.fileList = this.list;
   },
 };
 </script>

gassafety-web/src/views/enterprise/info/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="unitName">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="85px">
+      <el-form-item label="企业名称" prop="unitName">
         <el-input
           v-model="queryParams.unitName"
-          placeholder="请输入单位名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="组织机构代码" prop="orgCode">
-        <el-input
-          v-model="queryParams.orgCode"
-          placeholder="请输入组织机构代码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="生产经营地址" prop="runAddress">
-        <el-input
-          v-model="queryParams.runAddress"
-          placeholder="请输入生产经营地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="注册地址" prop="regAddress">
-        <el-input
-          v-model="queryParams.regAddress"
-          placeholder="请输入注册地址"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="监管分类大类" prop="regulationBigType">
-        <el-select v-model="queryParams.regulationBigType" placeholder="请选择监管分类大类" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="监管分类小类" prop="regulationSmallType">
-        <el-select v-model="queryParams.regulationSmallType" placeholder="请选择监管分类小类" clearable size="small">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="省份代码" prop="provinceId">
-        <el-input
-          v-model="queryParams.provinceId"
-          placeholder="请输入省份代码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="省份名称" prop="provinceName">
-        <el-input
-          v-model="queryParams.provinceName"
-          placeholder="请输入省份名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="城市代码" prop="cityId">
-        <el-input
-          v-model="queryParams.cityId"
-          placeholder="请输入城市代码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="城市名称" prop="cityName">
-        <el-input
-          v-model="queryParams.cityName"
-          placeholder="请输入城市名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="区县代码" prop="countyId">
-        <el-input
-          v-model="queryParams.countyId"
-          placeholder="请输入区县代码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="区县名称" prop="countyName">
-        <el-input
-          v-model="queryParams.countyName"
-          placeholder="请输入区县名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属地区" prop="areaName">
-        <el-input
-          v-model="queryParams.areaName"
-          placeholder="请输入所属地区"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属街道" prop="streetName">
-        <el-input
-          v-model="queryParams.streetName"
-          placeholder="请输入所属街道"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="经度" prop="longitude">
-        <el-input
-          v-model="queryParams.longitude"
-          placeholder="请输入经度"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="纬度" prop="latitude">
-        <el-input
-          v-model="queryParams.latitude"
-          placeholder="请输入纬度"
+          placeholder="请输入企业名称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -146,69 +19,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="法定代表人手机" prop="legalPersonPhone">
-        <el-input
-          v-model="queryParams.legalPersonPhone"
-          placeholder="请输入法定代表人手机"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="法定代表人座机号码" prop="legalPersonTelephone">
-        <el-input
-          v-model="queryParams.legalPersonTelephone"
-          placeholder="请输入法定代表人座机号码"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="法人邮箱" prop="legalPersonEmail">
-        <el-input
-          v-model="queryParams.legalPersonEmail"
-          placeholder="请输入法人邮箱"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否启用，0启用，1禁用" prop="isEnable">
-        <el-input
-          v-model="queryParams.isEnable"
-          placeholder="请输入是否启用，0启用，1禁用"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人id" prop="createUserId">
-        <el-input
-          v-model="queryParams.createUserId"
-          placeholder="请输入创建人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新人id" prop="updateUserId">
-        <el-input
-          v-model="queryParams.updateUserId"
-          placeholder="请输入更新人id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="remarks">
-        <el-input
-          v-model="queryParams.remarks"
-          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>
@@ -264,36 +74,22 @@
 
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="备注" align="center" prop="infoId" />
-      <el-table-column label="单位名称" align="center" prop="unitName" />
-      <el-table-column label="组织机构代码" align="center" prop="orgCode" />
-      <el-table-column label="营业执照图片路径" align="center" prop="orgFilePath" />
-      <el-table-column label="文件名称" align="center" prop="orgFileName" />
-      <el-table-column label="生产经营地址" align="center" prop="runAddress" />
+      <el-table-column type="index" label="序号" align="center" />
+      <el-table-column label="企业名称" align="center" prop="unitName" />
+      <el-table-column label="社会统一信用代码" align="center" prop="orgCode" />
       <el-table-column label="注册地址" align="center" prop="regAddress" />
-      <el-table-column label="监管分类大类" align="center" prop="regulationBigType" />
-      <el-table-column label="监管分类小类" align="center" prop="regulationSmallType" />
-      <el-table-column label="省份代码" align="center" prop="provinceId" />
-      <el-table-column label="省份名称" align="center" prop="provinceName" />
-      <el-table-column label="城市代码" align="center" prop="cityId" />
-      <el-table-column label="城市名称" align="center" prop="cityName" />
-      <el-table-column label="区县代码" align="center" prop="countyId" />
-      <el-table-column label="区县名称" align="center" prop="countyName" />
-      <el-table-column label="所属地区" align="center" prop="areaName" />
-      <el-table-column label="所属街道" align="center" prop="streetName" />
-      <el-table-column label="经度" align="center" prop="longitude" />
-      <el-table-column label="纬度" align="center" prop="latitude" />
       <el-table-column label="法定代表人" align="center" prop="legalPerson" />
-      <el-table-column label="法定代表人手机" align="center" prop="legalPersonPhone" />
-      <el-table-column label="法定代表人座机号码" align="center" prop="legalPersonTelephone" />
       <el-table-column label="法人邮箱" align="center" prop="legalPersonEmail" />
-      <el-table-column label="授权书" align="center" prop="authorizeFile" />
-      <el-table-column label="授权书文件原名" align="center" prop="authorizeFileOriginalName" />
-      <el-table-column label="厂区边界" align="center" prop="boundary" />
-      <el-table-column label="是否启用，0启用，1禁用" align="center" prop="isEnable" />
-      <el-table-column label="创建人id" align="center" prop="createUserId" />
-      <el-table-column label="更新人id" align="center" prop="updateUserId" />
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="营业执照" align="center" prop="orgFilePath" >
+        <template slot-scope="scope">
+          <span class="dbtn"
+            @click="checkFile(scope.row.orgFilePath)"
+            v-if="scope.row.orgFilePath != ''"
+          >
+            <i class="el-icon el-icon-view"></i>查看
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -323,99 +119,48 @@
     />
 
     <!-- 添加或修改企业基本信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="单位名称" prop="unitName">
-          <el-input v-model="form.unitName" placeholder="请输入单位名称" />
-        </el-form-item>
-        <el-form-item label="组织机构代码" prop="orgCode">
-          <el-input v-model="form.orgCode" placeholder="请输入组织机构代码" />
-        </el-form-item>
-        <el-form-item label="营业执照图片路径" prop="orgFilePath">
-          <el-input v-model="form.orgFilePath" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="文件名称" prop="orgFileName">
-          <el-input v-model="form.orgFileName" type="textarea" placeholder="请输入内容" />
+    <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="135px">
+        <el-col>
+          <el-form-item label="企业名称" prop="unitName">
+            <el-input v-model="form.unitName" placeholder="请输入企业名称" :style="{width: '100%'}"></el-input>
           </el-form-item>
-        <el-form-item label="生产经营地址" prop="runAddress">
-          <el-input v-model="form.runAddress" placeholder="请输入生产经营地址" />
-        </el-form-item>
-        <el-form-item label="注册地址" prop="regAddress">
-          <el-input v-model="form.regAddress" placeholder="请输入注册地址" />
-        </el-form-item>
-        <el-form-item label="监管分类大类" prop="regulationBigType">
-          <el-select v-model="form.regulationBigType" placeholder="请选择监管分类大类">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="监管分类小类" prop="regulationSmallType">
-          <el-select v-model="form.regulationSmallType" placeholder="请选择监管分类小类">
-            <el-option label="请选择字典生成" value="" />
-          </el-select>
-        </el-form-item>
-        <el-form-item label="省份代码" prop="provinceId">
-          <el-input v-model="form.provinceId" placeholder="请输入省份代码" />
-        </el-form-item>
-        <el-form-item label="省份名称" prop="provinceName">
-          <el-input v-model="form.provinceName" placeholder="请输入省份名称" />
-        </el-form-item>
-        <el-form-item label="城市代码" prop="cityId">
-          <el-input v-model="form.cityId" placeholder="请输入城市代码" />
-        </el-form-item>
-        <el-form-item label="城市名称" prop="cityName">
-          <el-input v-model="form.cityName" placeholder="请输入城市名称" />
-        </el-form-item>
-        <el-form-item label="区县代码" prop="countyId">
-          <el-input v-model="form.countyId" placeholder="请输入区县代码" />
-        </el-form-item>
-        <el-form-item label="区县名称" prop="countyName">
-          <el-input v-model="form.countyName" placeholder="请输入区县名称" />
-        </el-form-item>
-        <el-form-item label="所属地区" prop="areaName">
-          <el-input v-model="form.areaName" placeholder="请输入所属地区" />
-        </el-form-item>
-        <el-form-item label="所属街道" prop="streetName">
-          <el-input v-model="form.streetName" placeholder="请输入所属街道" />
-        </el-form-item>
-        <el-form-item label="经度" prop="longitude">
-          <el-input v-model="form.longitude" placeholder="请输入经度" />
-        </el-form-item>
-        <el-form-item label="纬度" prop="latitude">
-          <el-input v-model="form.latitude" placeholder="请输入纬度" />
-        </el-form-item>
-        <el-form-item label="法定代表人" prop="legalPerson">
-          <el-input v-model="form.legalPerson" placeholder="请输入法定代表人" />
-        </el-form-item>
-        <el-form-item label="法定代表人手机" prop="legalPersonPhone">
-          <el-input v-model="form.legalPersonPhone" placeholder="请输入法定代表人手机" />
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="统一社会信用代码" prop="orgCode">
+            <el-input v-model="form.orgCode" placeholder="请输入统一社会信用代码" :style="{width: '100%'}"></el-input>
           </el-form-item>
-        <el-form-item label="法定代表人座机号码" prop="legalPersonTelephone">
-          <el-input v-model="form.legalPersonTelephone" placeholder="请输入法定代表人座机号码" />
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="法人代表姓名" prop="legalPerson">
+            <el-input v-model="form.legalPerson" placeholder="请输入法人代表姓名" :style="{width: '100%'}"></el-input>
           </el-form-item>
+        </el-col>
+        <el-col :span="24">
           <el-form-item label="法人邮箱" prop="legalPersonEmail">
-          <el-input v-model="form.legalPersonEmail" placeholder="请输入法人邮箱" />
-        </el-form-item>
-        <el-form-item label="授权书">
-          <fileUpload v-model="form.authorizeFile"/>
+            <el-input v-model="form.legalPersonEmail" placeholder="请输入法人邮箱" :style="{width: '100%'}"></el-input>
           </el-form-item>
-        <el-form-item label="授权书文件原名" prop="authorizeFileOriginalName">
-          <el-input v-model="form.authorizeFileOriginalName" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="厂区边界" prop="boundary">
-          <el-input v-model="form.boundary" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="是否启用，0启用，1禁用" prop="isEnable">
-          <el-input v-model="form.isEnable" placeholder="请输入是否启用，0启用，1禁用" />
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="法人电话" prop="legalPersonPhone">
+            <el-input v-model="form.legalPersonPhone" placeholder="请输入法人手机" :style="{width: '100%'}"></el-input>
           </el-form-item>
-        <el-form-item label="创建人id" prop="createUserId">
-          <el-input v-model="form.createUserId" placeholder="请输入创建人id" />
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="注册地址" prop="regAddress">
+            <el-input v-model="form.regAddress" placeholder="请输入注册地址" :style="{width: '100%'}"></el-input>
           </el-form-item>
-        <el-form-item label="更新人id" prop="updateUserId">
-          <el-input v-model="form.updateUserId" placeholder="请输入更新人id" />
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="生产经营地址" prop="runAddress">
+            <el-input v-model="form.runAddress" placeholder="请输入生产经营地址" :style="{width: '100%'}"></el-input>
           </el-form-item>
-        <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注" />
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="营业执照上传" prop="orgFilePath">
+            <FileUpload :fileArr="fileList" @resFun="getFileInfo"/>
           </el-form-item>
+        </el-col>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -424,7 +169,6 @@
     </el-dialog>
   </div>
 </template>
-
 <script>
 import { listInfo, getInfo, delInfo, addInfo, updateInfo, exportInfo } from "@/api/enterprise/info";
 import FileUpload from '@/components/FileUpload';
@@ -456,6 +200,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      fileList: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -466,34 +211,37 @@ export default {
         orgFileName: null,
         runAddress: null,
         regAddress: null,
-        regulationBigType: null,
-        regulationSmallType: null,
-        provinceId: null,
-        provinceName: null,
-        cityId: null,
-        cityName: null,
-        countyId: null,
-        countyName: null,
-        areaName: null,
-        streetName: null,
         longitude: null,
         latitude: null,
         legalPerson: null,
         legalPersonPhone: null,
-        legalPersonTelephone: null,
         legalPersonEmail: null,
-        authorizeFile: null,
-        authorizeFileOriginalName: null,
-        boundary: null,
-        isEnable: null,
         createUserId: null,
         updateUserId: null,
         remarks: null
       },
       // 表单参数
-      form: {},
+      form: {
+        orgFileName: "",
+        orgFilePath: ""
+      },
       // 表单校验
       rules: {
+        unitName: [{
+          required: true,
+          message: '请输入企业名称',
+          trigger: 'blur'
+        }],
+        orgCode: [{
+          required: true,
+          message: '请输入统一社会信用代码',
+          trigger: 'blur'
+        }],
+        legalPerson: [{
+          required: true,
+          message: '请输入法人代表姓名',
+          trigger: 'blur'
+        }],
       }
     };
   },
@@ -510,10 +258,18 @@ export default {
         this.loading = false;
       });
     },
+    checkFile(url) {
+      window.open("" + url, "_blank");
+    },
+    getFileInfo(res){
+      this.form.orgFilePath = res.url;
+      this.form.orgFileName = res.fileName;
+    },
     // 取消按钮
     cancel() {
       this.open = false;
       this.reset();
+      this.fileList = [];
     },
     // 表单重置
     reset() {
@@ -525,26 +281,11 @@ export default {
         orgFileName: null,
         runAddress: null,
         regAddress: null,
-        regulationBigType: null,
-        regulationSmallType: null,
-        provinceId: null,
-        provinceName: null,
-        cityId: null,
-        cityName: null,
-        countyId: null,
-        countyName: null,
-        areaName: null,
-        streetName: null,
         longitude: null,
         latitude: null,
         legalPerson: null,
         legalPersonPhone: null,
-        legalPersonTelephone: null,
         legalPersonEmail: null,
-        authorizeFile: null,
-        authorizeFileOriginalName: null,
-        boundary: null,
-        isEnable: null,
         createUserId: null,
         updateUserId: null,
         updateTime: null,
@@ -583,6 +324,12 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = "修改企业基本信息";
+        if (this.form.orgFileName) {
+          this.fileList.push({
+            name: this.form.orgFileName,
+            url: this.form.orgFilePath,
+          });
+        }
       });
     },
     /** 提交按钮 */
@@ -608,7 +355,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const infoIds = row.infoId || this.ids;
-      this.$confirm('是否确认删除企业基本信息编号为"' + infoIds + '"的数据项?', "警告", {
+      const unitName = row.unitName || this.unitName;
+      this.$confirm('是否确认删除"' + unitName + '"的数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
@@ -637,3 +385,37 @@ export default {
   }
 };
 </script>
+<style scoped lang="scss">
+  .upload-file-uploader {
+    margin-bottom: 5px;
+  }
+  .upload-file-list .el-upload-list__item {
+    border: 1px solid #e4e7ed;
+    line-height: 2;
+    margin-bottom: 10px;
+    position: relative;
+  }
+  .upload-file-list .ele-upload-list__item-content {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    color: inherit;
+  }
+  .ele-upload-list__item-content-action .el-link {
+    margin-right: 10px;
+  }
+  .dbtn {
+    display: inline-block;
+    padding: 2px 5px;
+    cursor: pointer;
+    border-radius: 3px;
+    border-style: solid;
+    border-width: 0;
+    color: rgb(48, 180, 107);
+    font-size: 9px;
+  }
+  .dbtn:hover {
+    border-width: 1px;
+    border-color: rgb(48, 180, 107);
+  }
+</style>