Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MPatrolTeamController.java

@@ -0,0 +1,106 @@
+package com.ruoyi.web.controller.mobile;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.bo.GPatrolTeamBo;
+import com.ruoyi.gas.domain.vo.GPatrolTeamVo;
+import com.ruoyi.gas.service.IGPatrolTeamService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 巡检车队Controller
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Validated
+@Api(value = "巡检车队控制器", tags = {"巡检车队管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/mobile/patrolTeam")
+public class MPatrolTeamController extends BaseController {
+
+    private final IGPatrolTeamService iGPatrolTeamService;
+
+    /**
+     * 查询巡检车队列表
+     */
+    @ApiOperation("查询巡检车队列表")
+    @GetMapping("/list")
+    public TableDataInfo<GPatrolTeamVo> list(@Validated(QueryGroup.class) GPatrolTeamBo bo) {
+        return iGPatrolTeamService.queryPageList(bo);
+    }
+
+    /**
+     * 导出巡检车队列表
+     */
+    @ApiOperation("导出巡检车队列表")
+    @Log(title = "巡检车队", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated GPatrolTeamBo bo, HttpServletResponse response) {
+        List<GPatrolTeamVo> list = iGPatrolTeamService.queryList(bo);
+        ExcelUtil.exportExcel(list, "巡检车队", GPatrolTeamVo.class, response);
+    }
+
+    /**
+     * 获取巡检车队详细信息
+     */
+    @ApiOperation("获取巡检车队详细信息")
+    @GetMapping("/{id}")
+    public AjaxResult<GPatrolTeamVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return AjaxResult.success(iGPatrolTeamService.queryById(id));
+    }
+
+    /**
+     * 新增巡检车队
+     */
+    @ApiOperation("新增巡检车队")
+    @Log(title = "巡检车队", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody GPatrolTeamBo bo) {
+        return toAjax(iGPatrolTeamService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改巡检车队
+     */
+    @ApiOperation("修改巡检车队")
+    @Log(title = "巡检车队", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody GPatrolTeamBo bo) {
+        return toAjax(iGPatrolTeamService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除巡检车队
+     */
+    @ApiOperation("删除巡检车队")
+    @Log(title = "巡检车队" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids) {
+        return toAjax(iGPatrolTeamService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MRegulatingBoxMaintenanceController.java

@@ -0,0 +1,106 @@
+package com.ruoyi.web.controller.mobile;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenanceBo;
+import com.ruoyi.gas.domain.vo.GRegulatingBoxMaintenanceVo;
+import com.ruoyi.gas.service.IGRegulatingBoxMaintenanceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 调压箱维护Controller
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Validated
+@Api(value = "调压箱维护控制器", tags = {"调压箱维护管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/mobile/regulatingBoxMaintenance")
+public class MRegulatingBoxMaintenanceController extends BaseController {
+
+    private final IGRegulatingBoxMaintenanceService iGRegulatingBoxMaintenanceService;
+
+    /**
+     * 查询调压箱维护列表
+     */
+    @ApiOperation("查询调压箱维护列表")
+    @GetMapping("/list")
+    public TableDataInfo<GRegulatingBoxMaintenanceVo> list(@Validated(QueryGroup.class) GRegulatingBoxMaintenanceBo bo) {
+        return iGRegulatingBoxMaintenanceService.queryPageList(bo);
+    }
+
+    /**
+     * 导出调压箱维护列表
+     */
+    @ApiOperation("导出调压箱维护列表")
+    @Log(title = "调压箱维护", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated GRegulatingBoxMaintenanceBo bo, HttpServletResponse response) {
+        List<GRegulatingBoxMaintenanceVo> list = iGRegulatingBoxMaintenanceService.queryList(bo);
+        ExcelUtil.exportExcel(list, "调压箱维护", GRegulatingBoxMaintenanceVo.class, response);
+    }
+
+    /**
+     * 获取调压箱维护详细信息
+     */
+    @ApiOperation("获取调压箱维护详细信息")
+    @GetMapping("/{id}")
+    public AjaxResult<GRegulatingBoxMaintenanceVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return AjaxResult.success(iGRegulatingBoxMaintenanceService.queryById(id));
+    }
+
+    /**
+     * 新增调压箱维护
+     */
+    @ApiOperation("新增调压箱维护")
+    @Log(title = "调压箱维护", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody GRegulatingBoxMaintenanceBo bo) {
+        return toAjax(iGRegulatingBoxMaintenanceService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改调压箱维护
+     */
+    @ApiOperation("修改调压箱维护")
+    @Log(title = "调压箱维护", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody GRegulatingBoxMaintenanceBo bo) {
+        return toAjax(iGRegulatingBoxMaintenanceService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除调压箱维护
+     */
+    @ApiOperation("删除调压箱维护")
+    @Log(title = "调压箱维护" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids) {
+        return toAjax(iGRegulatingBoxMaintenanceService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/controller/GPatrolTeamController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.gas.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.bo.GPatrolTeamBo;
+import com.ruoyi.gas.domain.vo.GPatrolTeamVo;
+import com.ruoyi.gas.service.IGPatrolTeamService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 巡检车队Controller
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Validated
+@Api(value = "巡检车队控制器", tags = {"巡检车队管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/gas/patrolTeam")
+public class GPatrolTeamController extends BaseController {
+
+    private final IGPatrolTeamService iGPatrolTeamService;
+
+    /**
+     * 查询巡检车队列表
+     */
+    @ApiOperation("查询巡检车队列表")
+    @PreAuthorize("@ss.hasPermi('gas:patrolTeam:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GPatrolTeamVo> list(@Validated(QueryGroup.class) GPatrolTeamBo bo) {
+        return iGPatrolTeamService.queryPageList(bo);
+    }
+
+    /**
+     * 导出巡检车队列表
+     */
+    @ApiOperation("导出巡检车队列表")
+    @PreAuthorize("@ss.hasPermi('gas:patrolTeam:export')")
+    @Log(title = "巡检车队", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated GPatrolTeamBo bo, HttpServletResponse response) {
+        List<GPatrolTeamVo> list = iGPatrolTeamService.queryList(bo);
+        ExcelUtil.exportExcel(list, "巡检车队", GPatrolTeamVo.class, response);
+    }
+
+    /**
+     * 获取巡检车队详细信息
+     */
+    @ApiOperation("获取巡检车队详细信息")
+    @PreAuthorize("@ss.hasPermi('gas:patrolTeam:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<GPatrolTeamVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return AjaxResult.success(iGPatrolTeamService.queryById(id));
+    }
+
+    /**
+     * 新增巡检车队
+     */
+    @ApiOperation("新增巡检车队")
+    @PreAuthorize("@ss.hasPermi('gas:patrolTeam:add')")
+    @Log(title = "巡检车队", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody GPatrolTeamBo bo) {
+        return toAjax(iGPatrolTeamService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改巡检车队
+     */
+    @ApiOperation("修改巡检车队")
+    @PreAuthorize("@ss.hasPermi('gas:patrolTeam:edit')")
+    @Log(title = "巡检车队", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody GPatrolTeamBo bo) {
+        return toAjax(iGPatrolTeamService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除巡检车队
+     */
+    @ApiOperation("删除巡检车队")
+    @PreAuthorize("@ss.hasPermi('gas:patrolTeam:remove')")
+    @Log(title = "巡检车队" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids) {
+        return toAjax(iGPatrolTeamService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/controller/GPatrolTeamPhotoController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.gas.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.vo.GPatrolTeamPhotoVo;
+import com.ruoyi.gas.domain.bo.GPatrolTeamPhotoBo;
+import com.ruoyi.gas.service.IGPatrolTeamPhotoService;
+import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 巡检车队照片Controller
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Validated
+@Api(value = "巡检车队照片控制器", tags = {"巡检车队照片管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/gas/patrolTeamPhoto")
+public class GPatrolTeamPhotoController extends BaseController {
+
+    private final IGPatrolTeamPhotoService iGPatrolTeamPhotoService;
+
+    /**
+     * 查询巡检车队照片列表
+     */
+    @ApiOperation("查询巡检车队照片列表")
+    @PreAuthorize("@ss.hasPermi('gas:patrolTeamPhoto:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GPatrolTeamPhotoVo> list(@Validated(QueryGroup.class) GPatrolTeamPhotoBo bo) {
+        return iGPatrolTeamPhotoService.queryPageList(bo);
+    }
+
+    /**
+     * 导出巡检车队照片列表
+     */
+    @ApiOperation("导出巡检车队照片列表")
+    @PreAuthorize("@ss.hasPermi('gas:patrolTeamPhoto:export')")
+    @Log(title = "巡检车队照片", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated GPatrolTeamPhotoBo bo, HttpServletResponse response) {
+        List<GPatrolTeamPhotoVo> list = iGPatrolTeamPhotoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "巡检车队照片", GPatrolTeamPhotoVo.class, response);
+    }
+
+    /**
+     * 获取巡检车队照片详细信息
+     */
+    @ApiOperation("获取巡检车队照片详细信息")
+    @PreAuthorize("@ss.hasPermi('gas:patrolTeamPhoto:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<GPatrolTeamPhotoVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return AjaxResult.success(iGPatrolTeamPhotoService.queryById(id));
+    }
+
+    /**
+     * 新增巡检车队照片
+     */
+    @ApiOperation("新增巡检车队照片")
+    @PreAuthorize("@ss.hasPermi('gas:patrolTeamPhoto:add')")
+    @Log(title = "巡检车队照片", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody GPatrolTeamPhotoBo bo) {
+        return toAjax(iGPatrolTeamPhotoService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改巡检车队照片
+     */
+    @ApiOperation("修改巡检车队照片")
+    @PreAuthorize("@ss.hasPermi('gas:patrolTeamPhoto:edit')")
+    @Log(title = "巡检车队照片", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody GPatrolTeamPhotoBo bo) {
+        return toAjax(iGPatrolTeamPhotoService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除巡检车队照片
+     */
+    @ApiOperation("删除巡检车队照片")
+    @PreAuthorize("@ss.hasPermi('gas:patrolTeamPhoto:remove')")
+    @Log(title = "巡检车队照片" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids) {
+        return toAjax(iGPatrolTeamPhotoService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/controller/GRegulatingBoxMaintenanceController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.gas.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.vo.GRegulatingBoxMaintenanceVo;
+import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenanceBo;
+import com.ruoyi.gas.service.IGRegulatingBoxMaintenanceService;
+import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 调压箱维护Controller
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Validated
+@Api(value = "调压箱维护控制器", tags = {"调压箱维护管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/gas/regulatingBoxMaintenance")
+public class GRegulatingBoxMaintenanceController extends BaseController {
+
+    private final IGRegulatingBoxMaintenanceService iGRegulatingBoxMaintenanceService;
+
+    /**
+     * 查询调压箱维护列表
+     */
+    @ApiOperation("查询调压箱维护列表")
+    @PreAuthorize("@ss.hasPermi('gas:regulatingBoxMaintenance:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GRegulatingBoxMaintenanceVo> list(@Validated(QueryGroup.class) GRegulatingBoxMaintenanceBo bo) {
+        return iGRegulatingBoxMaintenanceService.queryPageList(bo);
+    }
+
+    /**
+     * 导出调压箱维护列表
+     */
+    @ApiOperation("导出调压箱维护列表")
+    @PreAuthorize("@ss.hasPermi('gas:regulatingBoxMaintenance:export')")
+    @Log(title = "调压箱维护", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated GRegulatingBoxMaintenanceBo bo, HttpServletResponse response) {
+        List<GRegulatingBoxMaintenanceVo> list = iGRegulatingBoxMaintenanceService.queryList(bo);
+        ExcelUtil.exportExcel(list, "调压箱维护", GRegulatingBoxMaintenanceVo.class, response);
+    }
+
+    /**
+     * 获取调压箱维护详细信息
+     */
+    @ApiOperation("获取调压箱维护详细信息")
+    @PreAuthorize("@ss.hasPermi('gas:regulatingBoxMaintenance:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<GRegulatingBoxMaintenanceVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return AjaxResult.success(iGRegulatingBoxMaintenanceService.queryById(id));
+    }
+
+    /**
+     * 新增调压箱维护
+     */
+    @ApiOperation("新增调压箱维护")
+    @PreAuthorize("@ss.hasPermi('gas:regulatingBoxMaintenance:add')")
+    @Log(title = "调压箱维护", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody GRegulatingBoxMaintenanceBo bo) {
+        return toAjax(iGRegulatingBoxMaintenanceService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改调压箱维护
+     */
+    @ApiOperation("修改调压箱维护")
+    @PreAuthorize("@ss.hasPermi('gas:regulatingBoxMaintenance:edit')")
+    @Log(title = "调压箱维护", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody GRegulatingBoxMaintenanceBo bo) {
+        return toAjax(iGRegulatingBoxMaintenanceService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除调压箱维护
+     */
+    @ApiOperation("删除调压箱维护")
+    @PreAuthorize("@ss.hasPermi('gas:regulatingBoxMaintenance:remove')")
+    @Log(title = "调压箱维护" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids) {
+        return toAjax(iGRegulatingBoxMaintenanceService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/controller/GRegulatingBoxMaintenancePhotoController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.gas.controller;
+
+import java.util.List;
+import java.util.Arrays;
+import java.util.concurrent.TimeUnit;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.ruoyi.common.annotation.RepeatSubmit;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.common.core.validate.QueryGroup;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.gas.domain.vo.GRegulatingBoxMaintenancePhotoVo;
+import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenancePhotoBo;
+import com.ruoyi.gas.service.IGRegulatingBoxMaintenancePhotoService;
+import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 调压箱维护照片Controller
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Validated
+@Api(value = "调压箱维护照片控制器", tags = {"调压箱维护照片管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/gas/regulatingBoxMaintenancePhoto")
+public class GRegulatingBoxMaintenancePhotoController extends BaseController {
+
+    private final IGRegulatingBoxMaintenancePhotoService iGRegulatingBoxMaintenancePhotoService;
+
+    /**
+     * 查询调压箱维护照片列表
+     */
+    @ApiOperation("查询调压箱维护照片列表")
+    @PreAuthorize("@ss.hasPermi('gas:regulatingBoxMaintenancePhoto:list')")
+    @GetMapping("/list")
+    public TableDataInfo<GRegulatingBoxMaintenancePhotoVo> list(@Validated(QueryGroup.class) GRegulatingBoxMaintenancePhotoBo bo) {
+        return iGRegulatingBoxMaintenancePhotoService.queryPageList(bo);
+    }
+
+    /**
+     * 导出调压箱维护照片列表
+     */
+    @ApiOperation("导出调压箱维护照片列表")
+    @PreAuthorize("@ss.hasPermi('gas:regulatingBoxMaintenancePhoto:export')")
+    @Log(title = "调压箱维护照片", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public void export(@Validated GRegulatingBoxMaintenancePhotoBo bo, HttpServletResponse response) {
+        List<GRegulatingBoxMaintenancePhotoVo> list = iGRegulatingBoxMaintenancePhotoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "调压箱维护照片", GRegulatingBoxMaintenancePhotoVo.class, response);
+    }
+
+    /**
+     * 获取调压箱维护照片详细信息
+     */
+    @ApiOperation("获取调压箱维护照片详细信息")
+    @PreAuthorize("@ss.hasPermi('gas:regulatingBoxMaintenancePhoto:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<GRegulatingBoxMaintenancePhotoVo> getInfo(@NotNull(message = "主键不能为空")
+                                                  @PathVariable("id") Long id) {
+        return AjaxResult.success(iGRegulatingBoxMaintenancePhotoService.queryById(id));
+    }
+
+    /**
+     * 新增调压箱维护照片
+     */
+    @ApiOperation("新增调压箱维护照片")
+    @PreAuthorize("@ss.hasPermi('gas:regulatingBoxMaintenancePhoto:add')")
+    @Log(title = "调压箱维护照片", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody GRegulatingBoxMaintenancePhotoBo bo) {
+        return toAjax(iGRegulatingBoxMaintenancePhotoService.insertByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改调压箱维护照片
+     */
+    @ApiOperation("修改调压箱维护照片")
+    @PreAuthorize("@ss.hasPermi('gas:regulatingBoxMaintenancePhoto:edit')")
+    @Log(title = "调压箱维护照片", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody GRegulatingBoxMaintenancePhotoBo bo) {
+        return toAjax(iGRegulatingBoxMaintenancePhotoService.updateByBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 删除调压箱维护照片
+     */
+    @ApiOperation("删除调压箱维护照片")
+    @PreAuthorize("@ss.hasPermi('gas:regulatingBoxMaintenancePhoto:remove')")
+    @Log(title = "调压箱维护照片" , businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids) {
+        return toAjax(iGRegulatingBoxMaintenancePhotoService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    }
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/controller/GValveWellInspectionController.java

@@ -12,6 +12,7 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.gas.domain.bo.GValveWellInspectionBo;
 import com.ruoyi.gas.domain.vo.GValveWellInspectionVo;
+import com.ruoyi.gas.domain.vo.GValveWellInspectionVos;
 import com.ruoyi.gas.service.IGValveWellInspectionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -48,7 +49,7 @@ public class GValveWellInspectionController extends BaseController {
     @ApiOperation("查询阀井巡查列表")
     @PreAuthorize("@ss.hasPermi('gas:valveWellInspection:list')")
     @GetMapping("/list")
-    public TableDataInfo<GValveWellInspectionVo> list(@Validated(QueryGroup.class) GValveWellInspectionBo bo) {
+    public TableDataInfo<GValveWellInspectionVos> list(@Validated(QueryGroup.class) GValveWellInspectionBo bo) {
         return iGValveWellInspectionService.queryPageList(bo);
     }
 

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GPatrolTeam.java

@@ -0,0 +1,46 @@
+package com.ruoyi.gas.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 巡检车队对象 g_patrol_team
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_patrol_team")
+public class GPatrolTeam extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 班组
+     */
+    private String team;
+    /**
+     * 上传位置
+     */
+    private String uploadLocation;
+    /**
+     * 是否正常巡检
+     */
+    private String isNormalInspection;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GPatrolTeamPhoto.java

@@ -0,0 +1,45 @@
+package com.ruoyi.gas.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 巡检车队照片对象 g_patrol_team_photo
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_patrol_team_photo")
+public class GPatrolTeamPhoto extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 上级id
+     */
+    private Long parentId;
+    /**
+     * 照片
+     */
+    private String picUrl;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatingBoxMaintenance.java

@@ -0,0 +1,55 @@
+package com.ruoyi.gas.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 调压箱维护对象 g_regulating_box_maintenance
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_regulating_box_maintenance")
+public class GRegulatingBoxMaintenance extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+    private String processStatus;
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 编号
+     */
+    private String number;
+    /**
+     * 管理所
+     */
+    private String administrativeOffice;
+    private Long parentId;
+    /**
+     * 维护项目
+     */
+    private String maintenanceItem;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatingBoxMaintenancePhoto.java

@@ -0,0 +1,42 @@
+package com.ruoyi.gas.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 调压箱维护照片对象 g_regulating_box_maintenance_photo
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_regulating_box_maintenance_photo")
+public class GRegulatingBoxMaintenancePhoto extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 上级id
+     */
+    private Long parentId;
+    /**
+     * 照片
+     */
+    private String picUrl;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRegulatorBox.java

@@ -32,6 +32,9 @@ public class GRegulatorBox extends BaseEntity {
      */
     private Long areaId;
     private String name;
+    private Long parentId;
+    private String remarks;
+    private String processStatus;
     /**
      * 管理所
      */
@@ -168,7 +171,7 @@ public class GRegulatorBox extends BaseEntity {
     /**
      * 备注
      */
-    private String remarks;
+    private String remark;
     /**
      * 删除标志
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GRoadSectionInspection.java

@@ -1,16 +1,13 @@
 package com.ruoyi.gas.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 路段巡查对象 g_road_section_inspection
@@ -25,6 +22,8 @@ public class GRoadSectionInspection extends BaseEntity {
 
     private static final long serialVersionUID=1L;
 
+    private String remarks;
+    private String processStatus;
     /**
      * 主键id
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GValveWellInspection.java

@@ -1,16 +1,13 @@
 package com.ruoyi.gas.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
 
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 阀井巡查对象 g_valve_well_inspection
@@ -24,9 +21,11 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class GValveWellInspection extends BaseEntity {
 
     private static final long serialVersionUID=1L;
+    private String remarks;
+    private String processStatus;
 
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Long id;

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GValveWellPosition.java

@@ -1,14 +1,11 @@
 package com.ruoyi.gas.domain;
 
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseEntity;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
-import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
-
-import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 阀井位置对象 g_valve_well_position
@@ -22,9 +19,17 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class GValveWellPosition extends BaseEntity {
 
     private static final long serialVersionUID=1L;
-
+    private String district;
+    private String team;
+    private String valveHeadShape;
+    private String valveWellDepth;
+    private String manholeCoverInstead;
+    private String waterCondition;
+    private String pressureRating;
+    private String isXyxjcnkg;
+    private String remarks;
     /**
-     * 
+     *
      */
     @TableId(value = "id")
     private Long id;

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GCourtyardNetworkManagementBo.java

@@ -26,6 +26,7 @@ public class GCourtyardNetworkManagementBo extends BaseEntity {
     private String processStatus;
     private String processComments;
     private String ranks;
+    private String areaName;
     /**
      * 主键id
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GPatrolTeamBo.java

@@ -0,0 +1,82 @@
+package com.ruoyi.gas.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 巡检车队业务对象 g_patrol_team
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("巡检车队业务对象")
+public class GPatrolTeamBo extends BaseEntity {
+    private List<String> photoList;
+    private String ranks;
+    private List<Long> uids;
+    /**
+     *
+     */
+    @ApiModelProperty(value = "", required = true)
+    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 班组
+     */
+    @ApiModelProperty(value = "班组", required = true)
+    @NotBlank(message = "班组不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String team;
+
+    /**
+     * 上传位置
+     */
+    @ApiModelProperty(value = "上传位置", required = true)
+    @NotBlank(message = "上传位置不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String uploadLocation;
+
+    /**
+     * 是否正常巡检
+     */
+    @ApiModelProperty(value = "是否正常巡检", required = true)
+    @NotBlank(message = "是否正常巡检不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String isNormalInspection;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GPatrolTeamPhotoBo.java

@@ -0,0 +1,73 @@
+package com.ruoyi.gas.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 巡检车队照片业务对象 g_patrol_team_photo
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("巡检车队照片业务对象")
+public class GPatrolTeamPhotoBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id", required = true)
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 上级id
+     */
+    @ApiModelProperty(value = "上级id", required = true)
+    @NotNull(message = "上级id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long parentId;
+
+    /**
+     * 照片
+     */
+    @ApiModelProperty(value = "照片", required = true)
+    @NotBlank(message = "照片不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String picUrl;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatingBoxMaintenanceBo.java

@@ -0,0 +1,92 @@
+package com.ruoyi.gas.domain.bo;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 调压箱维护业务对象 g_regulating_box_maintenance
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("调压箱维护业务对象")
+public class GRegulatingBoxMaintenanceBo extends BaseEntity {
+    private List<String> photoList;
+
+    private String ranks;
+    private String processStatus;
+    private List<Long> uids;
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "主键", required = true)
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+    private Long parentId;
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty(value = "名称", required = true)
+    private String name;
+
+    /**
+     * 编号
+     */
+    @ApiModelProperty(value = "编号", required = true)
+    private String number;
+
+    /**
+     * 管理所
+     */
+    @ApiModelProperty(value = "管理所", required = true)
+    private String administrativeOffice;
+
+    /**
+     * 维护项目
+     */
+    @ApiModelProperty(value = "维护项目", required = true)
+    private String maintenanceItem;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注", required = true)
+    private String remarks;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatingBoxMaintenancePhotoBo.java

@@ -0,0 +1,73 @@
+package com.ruoyi.gas.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 调压箱维护照片业务对象 g_regulating_box_maintenance_photo
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("调压箱维护照片业务对象")
+public class GRegulatingBoxMaintenancePhotoBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @ApiModelProperty(value = "主键id", required = true)
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 上级id
+     */
+    @ApiModelProperty(value = "上级id", required = true)
+    @NotNull(message = "上级id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long parentId;
+
+    /**
+     * 照片
+     */
+    @ApiModelProperty(value = "照片", required = true)
+    @NotBlank(message = "照片不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String picUrl;
+
+
+    /**
+     * 分页大小
+     */
+    @ApiModelProperty("分页大小")
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    @ApiModelProperty("当前页数")
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    @ApiModelProperty("排序列")
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    @ApiModelProperty(value = "排序的方向", example = "asc,desc")
+    private String isAsc;
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxBo.java

@@ -267,5 +267,8 @@ public class GRegulatorBoxBo extends BaseEntity {
     @ApiModelProperty(value = "排序的方向", example = "asc,desc")
     private String isAsc;
     private String ranks;
+    private Long parentId;
+    private String remark;
+    private String processStatus;
 
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRoadSectionInspectionBo.java

@@ -26,6 +26,10 @@ public class GRoadSectionInspectionBo extends BaseEntity {
 
     private List<String> photoList;
 
+    private String ranks;
+    private List<Long> uids;
+    private String remarks;
+    private String processStatus;
     /**
      * 主键id
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GValveWellInspectionBo.java

@@ -2,15 +2,11 @@ package com.ruoyi.gas.domain.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.Date;
 import java.util.List;
 
@@ -27,25 +23,26 @@ import java.util.List;
 public class GValveWellInspectionBo extends BaseEntity {
 
     private List<String> photoList;
+    private String ranks;
+    private String remarks;
+    private String processStatus;
     /**
      *
      */
     @ApiModelProperty(value = "", required = true)
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 位置id
      */
     @ApiModelProperty(value = "位置id", required = true)
-    @NotNull(message = "位置id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long positionId;
+    private String valveWellName;
 
     /**
      * 发现问题
      */
     @ApiModelProperty(value = "发现问题", required = true)
-    @NotBlank(message = "发现问题不能为空", groups = { AddGroup.class, EditGroup.class })
     private String discoverProblems;
 
     /**

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GValveWellPositionBo.java

@@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull;
 public class GValveWellPositionBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @ApiModelProperty(value = "", required = true)
     @NotNull(message = "不能为空", groups = { EditGroup.class })
@@ -89,4 +89,14 @@ public class GValveWellPositionBo extends BaseEntity {
     @ApiModelProperty(value = "排序的方向", example = "asc,desc")
     private String isAsc;
 
+    private String district;
+    private String team;
+    private String valveHeadShape;
+    private String valveWellDepth;
+    private String manholeCoverInstead;
+    private String waterCondition;
+    private String pressureRating;
+    private String isXyxjcnkg;
+    private String remarks;
+
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GPatrolTeamPhotoVo.java

@@ -0,0 +1,49 @@
+package com.ruoyi.gas.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 巡检车队照片视图对象 g_patrol_team_photo
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Data
+@ApiModel("巡检车队照片视图对象")
+@ExcelIgnoreUnannotated
+public class GPatrolTeamPhotoVo {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+	@ExcelProperty(value = "主键id")
+	@ApiModelProperty("主键id")
+	private Long id;
+
+    /**
+     * 上级id
+     */
+	@ExcelProperty(value = "上级id")
+	@ApiModelProperty("上级id")
+	private Long parentId;
+
+    /**
+     * 照片
+     */
+	@ExcelProperty(value = "照片")
+	@ApiModelProperty("照片")
+	private String picUrl;
+
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GPatrolTeamVo.java

@@ -0,0 +1,59 @@
+package com.ruoyi.gas.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 巡检车队视图对象 g_patrol_team
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Data
+@ApiModel("巡检车队视图对象")
+@ExcelIgnoreUnannotated
+public class GPatrolTeamVo extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+	private List<String> photoList;
+	private String createByName;
+    /**
+     *
+     */
+	@ExcelProperty(value = "")
+	@ApiModelProperty("")
+	private Long id;
+
+    /**
+     * 班组
+     */
+    @ExcelProperty(value = "班组", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "team")
+	@ApiModelProperty("班组")
+	private String team;
+
+    /**
+     * 上传位置
+     */
+	@ExcelProperty(value = "上传位置")
+	@ApiModelProperty("上传位置")
+	private String uploadLocation;
+
+    /**
+     * 是否正常巡检
+     */
+	@ExcelProperty(value = "是否正常巡检")
+	@ApiModelProperty("是否正常巡检")
+	private String isNormalInspection;
+
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatingBoxMaintenancePhotoVo.java

@@ -0,0 +1,49 @@
+package com.ruoyi.gas.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 调压箱维护照片视图对象 g_regulating_box_maintenance_photo
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Data
+@ApiModel("调压箱维护照片视图对象")
+@ExcelIgnoreUnannotated
+public class GRegulatingBoxMaintenancePhotoVo {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+	@ExcelProperty(value = "主键id")
+	@ApiModelProperty("主键id")
+	private Long id;
+
+    /**
+     * 上级id
+     */
+	@ExcelProperty(value = "上级id")
+	@ApiModelProperty("上级id")
+	private Long parentId;
+
+    /**
+     * 照片
+     */
+	@ExcelProperty(value = "照片")
+	@ApiModelProperty("照片")
+	private String picUrl;
+
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatingBoxMaintenanceVo.java

@@ -0,0 +1,79 @@
+package com.ruoyi.gas.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 调压箱维护视图对象 g_regulating_box_maintenance
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Data
+@ApiModel("调压箱维护视图对象")
+@ExcelIgnoreUnannotated
+public class GRegulatingBoxMaintenanceVo extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	private List<String> photoList;
+	private String createByName;
+	private Long parentId;
+    /**
+     * 主键
+     */
+	@ExcelProperty(value = "主键")
+	@ApiModelProperty("主键")
+	private Long id;
+
+    /**
+     * 名称
+     */
+	@ExcelProperty(value = "名称")
+	@ApiModelProperty("名称")
+	private String name;
+
+    /**
+     * 编号
+     */
+	@ExcelProperty(value = "编号")
+	@ApiModelProperty("编号")
+	private String number;
+
+    /**
+     * 管理所
+     */
+	@ExcelProperty(value = "管理所")
+	@ApiModelProperty("管理所")
+	private String administrativeOffice;
+
+	@ExcelProperty(value = "审核状态", converter = ExcelDictConvert.class)
+	@ExcelDictFormat(dictType = "process_status")
+	@ApiModelProperty("审核状态")
+	private String processStatus;
+    /**
+     * 维护项目
+     */
+    @ExcelProperty(value = "维护项目", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "regulating_box_maintenance")
+	@ApiModelProperty("维护项目")
+	private String maintenanceItem;
+
+    /**
+     * 备注
+     */
+	@ExcelProperty(value = "备注")
+	@ApiModelProperty("备注")
+	private String remarks;
+
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRegulatorBoxVo.java

@@ -33,7 +33,10 @@ public class GRegulatorBoxVo extends BaseEntity {
 //	private String buildingName;
 //	private String unitName;
 	private String createByName;
+	private Long parentId;
 	private List<String> photoList;
+	private String remark;
+	private String processStatus;
     /**
      * 主键
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GRoadSectionInspectionVo.java

@@ -27,6 +27,8 @@ public class GRoadSectionInspectionVo  extends BaseEntity {
 	private static final long serialVersionUID = 1L;
 
 	private List<String> photoList;
+	private String remarks;
+	private String processStatus;
     /**
      * 主键id
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GValveWellInspectionVo.java

@@ -28,7 +28,7 @@ public class GValveWellInspectionVo extends BaseEntity {
 	private List<String> photoList;
 	GValveWellPosition position;
     /**
-     * 
+     *
      */
 	@ExcelProperty(value = "")
 	@ApiModelProperty("")
@@ -61,6 +61,8 @@ public class GValveWellInspectionVo extends BaseEntity {
 	@ExcelProperty(value = "备注")
 	@ApiModelProperty("备注")
 	private String remark;
+	private String remarks;
+	private String processStatus;
 	private String createByName;
 
 

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GValveWellInspectionVos.java

@@ -0,0 +1,32 @@
+package com.ruoyi.gas.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 阀井巡查视图对象 g_valve_well_inspection
+ *
+ * @author ruoyi
+ * @date 2024-03-18
+ */
+@Data
+public class GValveWellInspectionVos{
+
+	private static final long serialVersionUID = 1L;
+
+	private List<String> photoList;
+	private Long id;
+	private String valveWellName;
+	private String createByName;
+	private String discoverProblems;
+	private String remark;
+	private String positionName;
+	private String remarks;
+	private String processStatus;
+	private Long positionId;
+	private Date createTime;
+	private String createBy;
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/vo/GValveWellPositionVo.java

@@ -2,12 +2,9 @@ package com.ruoyi.gas.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import java.util.Date;
 
 
 
@@ -23,9 +20,17 @@ import java.util.Date;
 public class GValveWellPositionVo {
 
 	private static final long serialVersionUID = 1L;
-
+	private String district;
+	private String team;
+	private String valveHeadShape;
+	private String valveWellDepth;
+	private String manholeCoverInstead;
+	private String waterCondition;
+	private String pressureRating;
+	private String isXyxjcnkg;
+	private String remarks;
     /**
-     * 
+     *
      */
 	@ExcelProperty(value = "")
 	@ApiModelProperty("")

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GPatrolTeamMapper.java

@@ -0,0 +1,17 @@
+package com.ruoyi.gas.mapper;
+
+import com.ruoyi.gas.domain.GPatrolTeam;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+
+import java.util.List;
+
+/**
+ * 巡检车队Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+public interface GPatrolTeamMapper extends BaseMapperPlus<GPatrolTeam> {
+    List<String> getPhoto(Long id);
+    String getName(String id);
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GPatrolTeamPhotoMapper.java

@@ -0,0 +1,17 @@
+package com.ruoyi.gas.mapper;
+
+import com.ruoyi.gas.domain.GPatrolTeamPhoto;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 巡检车队照片Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+public interface GPatrolTeamPhotoMapper extends BaseMapperPlus<GPatrolTeamPhoto> {
+    int deleteByUrl(@Param("parentId") Long parentId, @Param("list") List<String> list);
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GRegulatingBoxMaintenanceMapper.java

@@ -0,0 +1,18 @@
+package com.ruoyi.gas.mapper;
+
+import com.ruoyi.gas.domain.GRegulatingBoxMaintenance;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+
+import java.util.List;
+
+/**
+ * 调压箱维护Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+public interface GRegulatingBoxMaintenanceMapper extends BaseMapperPlus<GRegulatingBoxMaintenance> {
+
+    List<String> getPhoto(Long id);
+    String getName(String id);
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GRegulatingBoxMaintenancePhotoMapper.java

@@ -0,0 +1,18 @@
+package com.ruoyi.gas.mapper;
+
+import com.ruoyi.gas.domain.GRegulatingBoxMaintenancePhoto;
+import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 调压箱维护照片Mapper接口
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+public interface GRegulatingBoxMaintenancePhotoMapper extends BaseMapperPlus<GRegulatingBoxMaintenancePhoto> {
+    int deleteByUrl(@Param("parentId") Long parentId, @Param("list") List<String> list);
+
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GUserMapper.java

@@ -26,4 +26,6 @@ public interface GUserMapper extends BaseMapperPlus<GUser> {
     List<GCensusVo> getExamineWorker(Long workerId);
     GUserVo getForPhone(@Param("phone")Long phone,@Param("id")String id);
     GUserVo getForJobnum(@Param("jobNum")String jobNum,@Param("id")String id);
+
+    List<Long> getByRanks(String ranks);
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GValveWellInspectionMapper.java

@@ -1,7 +1,11 @@
 package com.ruoyi.gas.mapper;
 
-import com.ruoyi.gas.domain.GValveWellInspection;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import com.ruoyi.gas.domain.GValveWellInspection;
+import com.ruoyi.gas.domain.bo.GValveWellInspectionBo;
+import com.ruoyi.gas.domain.vo.GValveWellInspectionVos;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,4 +18,5 @@ import java.util.List;
 public interface GValveWellInspectionMapper extends BaseMapperPlus<GValveWellInspection> {
     List<String> getPhoto(Long id);
     String getName(String id);
+    Page<GValveWellInspectionVos> getList(@Param("p") GValveWellInspectionBo bo, Page<?> page);
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGPatrolTeamPhotoService.java

@@ -0,0 +1,59 @@
+package com.ruoyi.gas.service;
+
+import com.ruoyi.gas.domain.GPatrolTeamPhoto;
+import com.ruoyi.gas.domain.vo.GPatrolTeamPhotoVo;
+import com.ruoyi.gas.domain.bo.GPatrolTeamPhotoBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 巡检车队照片Service接口
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+public interface IGPatrolTeamPhotoService extends IServicePlus<GPatrolTeamPhoto, GPatrolTeamPhotoVo> {
+
+	void deleteByUrl(Long parentId, List<String> list);
+
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GPatrolTeamPhotoVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GPatrolTeamPhotoVo> queryPageList(GPatrolTeamPhotoBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GPatrolTeamPhotoVo> queryList(GPatrolTeamPhotoBo bo);
+
+	/**
+	 * 根据新增业务对象插入巡检车队照片
+	 * @param bo 巡检车队照片新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GPatrolTeamPhotoBo bo);
+
+	/**
+	 * 根据编辑业务对象修改巡检车队照片
+	 * @param bo 巡检车队照片编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GPatrolTeamPhotoBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGPatrolTeamService.java

@@ -0,0 +1,56 @@
+package com.ruoyi.gas.service;
+
+import com.ruoyi.gas.domain.GPatrolTeam;
+import com.ruoyi.gas.domain.vo.GPatrolTeamVo;
+import com.ruoyi.gas.domain.bo.GPatrolTeamBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 巡检车队Service接口
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+public interface IGPatrolTeamService extends IServicePlus<GPatrolTeam, GPatrolTeamVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GPatrolTeamVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GPatrolTeamVo> queryPageList(GPatrolTeamBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GPatrolTeamVo> queryList(GPatrolTeamBo bo);
+
+	/**
+	 * 根据新增业务对象插入巡检车队
+	 * @param bo 巡检车队新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GPatrolTeamBo bo);
+
+	/**
+	 * 根据编辑业务对象修改巡检车队
+	 * @param bo 巡检车队编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GPatrolTeamBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGRegulatingBoxMaintenancePhotoService.java

@@ -0,0 +1,57 @@
+package com.ruoyi.gas.service;
+
+import com.ruoyi.gas.domain.GRegulatingBoxMaintenancePhoto;
+import com.ruoyi.gas.domain.vo.GRegulatingBoxMaintenancePhotoVo;
+import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenancePhotoBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 调压箱维护照片Service接口
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+public interface IGRegulatingBoxMaintenancePhotoService extends IServicePlus<GRegulatingBoxMaintenancePhoto, GRegulatingBoxMaintenancePhotoVo> {
+	void deleteByUrl(Long parentId, List<String> list);
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GRegulatingBoxMaintenancePhotoVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GRegulatingBoxMaintenancePhotoVo> queryPageList(GRegulatingBoxMaintenancePhotoBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GRegulatingBoxMaintenancePhotoVo> queryList(GRegulatingBoxMaintenancePhotoBo bo);
+
+	/**
+	 * 根据新增业务对象插入调压箱维护照片
+	 * @param bo 调压箱维护照片新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GRegulatingBoxMaintenancePhotoBo bo);
+
+	/**
+	 * 根据编辑业务对象修改调压箱维护照片
+	 * @param bo 调压箱维护照片编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GRegulatingBoxMaintenancePhotoBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGRegulatingBoxMaintenanceService.java

@@ -0,0 +1,56 @@
+package com.ruoyi.gas.service;
+
+import com.ruoyi.gas.domain.GRegulatingBoxMaintenance;
+import com.ruoyi.gas.domain.vo.GRegulatingBoxMaintenanceVo;
+import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenanceBo;
+import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 调压箱维护Service接口
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+public interface IGRegulatingBoxMaintenanceService extends IServicePlus<GRegulatingBoxMaintenance, GRegulatingBoxMaintenanceVo> {
+	/**
+	 * 查询单个
+	 * @return
+	 */
+	GRegulatingBoxMaintenanceVo queryById(Long id);
+
+	/**
+	 * 查询列表
+	 */
+    TableDataInfo<GRegulatingBoxMaintenanceVo> queryPageList(GRegulatingBoxMaintenanceBo bo);
+
+	/**
+	 * 查询列表
+	 */
+	List<GRegulatingBoxMaintenanceVo> queryList(GRegulatingBoxMaintenanceBo bo);
+
+	/**
+	 * 根据新增业务对象插入调压箱维护
+	 * @param bo 调压箱维护新增业务对象
+	 * @return
+	 */
+	Boolean insertByBo(GRegulatingBoxMaintenanceBo bo);
+
+	/**
+	 * 根据编辑业务对象修改调压箱维护
+	 * @param bo 调压箱维护编辑业务对象
+	 * @return
+	 */
+	Boolean updateByBo(GRegulatingBoxMaintenanceBo bo);
+
+	/**
+	 * 校验并删除数据
+	 * @param ids 主键集合
+	 * @param isValid 是否校验,true-删除前校验,false-不校验
+	 * @return
+	 */
+	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGUserService.java

@@ -18,6 +18,7 @@ import java.util.List;
  * @date 2021-11-12
  */
 public interface IGUserService extends IServicePlus<GUser, GUserVo> {
+	List<Long> getByRanks(String ranks);
 	/**
 	 * 查询单个
 	 * @return

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGValveWellInspectionService.java

@@ -1,10 +1,11 @@
 package com.ruoyi.gas.service;
 
-import com.ruoyi.gas.domain.GValveWellInspection;
-import com.ruoyi.gas.domain.vo.GValveWellInspectionVo;
-import com.ruoyi.gas.domain.bo.GValveWellInspectionBo;
 import com.ruoyi.common.core.mybatisplus.core.IServicePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.gas.domain.GValveWellInspection;
+import com.ruoyi.gas.domain.bo.GValveWellInspectionBo;
+import com.ruoyi.gas.domain.vo.GValveWellInspectionVo;
+import com.ruoyi.gas.domain.vo.GValveWellInspectionVos;
 
 import java.util.Collection;
 import java.util.List;
@@ -25,7 +26,7 @@ public interface IGValveWellInspectionService extends IServicePlus<GValveWellIns
 	/**
 	 * 查询列表
 	 */
-    TableDataInfo<GValveWellInspectionVo> queryPageList(GValveWellInspectionBo bo);
+    TableDataInfo<GValveWellInspectionVos> queryPageList(GValveWellInspectionBo bo);
 
 	/**
 	 * 查询列表

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPatrolTeamPhotoServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.gas.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.gas.domain.bo.GPatrolTeamPhotoBo;
+import com.ruoyi.gas.domain.vo.GPatrolTeamPhotoVo;
+import com.ruoyi.gas.domain.GPatrolTeamPhoto;
+import com.ruoyi.gas.mapper.GPatrolTeamPhotoMapper;
+import com.ruoyi.gas.service.IGPatrolTeamPhotoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 巡检车队照片Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Service
+public class GPatrolTeamPhotoServiceImpl extends ServicePlusImpl<GPatrolTeamPhotoMapper, GPatrolTeamPhoto, GPatrolTeamPhotoVo> implements IGPatrolTeamPhotoService {
+    @Override
+    public void deleteByUrl(Long parentId, List<String> list) {
+        baseMapper.deleteByUrl(parentId,list);
+    }
+
+    @Override
+    public GPatrolTeamPhotoVo queryById(Long id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<GPatrolTeamPhotoVo> queryPageList(GPatrolTeamPhotoBo bo) {
+        PagePlus<GPatrolTeamPhoto, GPatrolTeamPhotoVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GPatrolTeamPhotoVo> queryList(GPatrolTeamPhotoBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GPatrolTeamPhoto> buildQueryWrapper(GPatrolTeamPhotoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GPatrolTeamPhoto> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getParentId() != null, GPatrolTeamPhoto::getParentId, bo.getParentId());
+        lqw.eq(StringUtils.isNotBlank(bo.getPicUrl()), GPatrolTeamPhoto::getPicUrl, bo.getPicUrl());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GPatrolTeamPhotoBo bo) {
+        GPatrolTeamPhoto add = BeanUtil.toBean(bo, GPatrolTeamPhoto.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GPatrolTeamPhotoBo bo) {
+        GPatrolTeamPhoto update = BeanUtil.toBean(bo, GPatrolTeamPhoto.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GPatrolTeamPhoto entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPatrolTeamServiceImpl.java

@@ -0,0 +1,150 @@
+package com.ruoyi.gas.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.gas.domain.GPatrolTeam;
+import com.ruoyi.gas.domain.bo.GPatrolTeamBo;
+import com.ruoyi.gas.domain.bo.GPatrolTeamPhotoBo;
+import com.ruoyi.gas.domain.vo.GPatrolTeamVo;
+import com.ruoyi.gas.mapper.GPatrolTeamMapper;
+import com.ruoyi.gas.service.IGPatrolTeamPhotoService;
+import com.ruoyi.gas.service.IGPatrolTeamService;
+import com.ruoyi.gas.service.IGUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 巡检车队Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Service
+public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, GPatrolTeam, GPatrolTeamVo> implements IGPatrolTeamService {
+
+    @Override
+    public GPatrolTeamVo queryById(Long id) {
+        GPatrolTeamVo voById = getVoById(id);
+        voById.setPhotoList(baseMapper.getPhoto(id));
+        voById.setCreateByName(baseMapper.getName(voById.getCreateBy()));
+        return voById;
+    }
+
+    @Autowired
+    private IGUserService gUserService;
+
+    @Override
+    public TableDataInfo<GPatrolTeamVo> queryPageList(GPatrolTeamBo bo) {
+        String ranks = bo.getRanks();
+        if (StringUtils.isNotEmpty(ranks)) {
+            bo.setUids(gUserService.getByRanks(ranks));
+        }
+        PagePlus<GPatrolTeam, GPatrolTeamVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        result.getRecordsVo().forEach(item -> {
+            item.setPhotoList(baseMapper.getPhoto(item.getId()));
+            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
+        });
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GPatrolTeamVo> queryList(GPatrolTeamBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GPatrolTeam> buildQueryWrapper(GPatrolTeamBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GPatrolTeam> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getTeam()), GPatrolTeam::getTeam, bo.getTeam());
+        lqw.eq(StringUtils.isNotBlank(bo.getUploadLocation()), GPatrolTeam::getUploadLocation, bo.getUploadLocation());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsNormalInspection()), GPatrolTeam::getIsNormalInspection, bo.getIsNormalInspection());
+        lqw.in(StringUtils.isNotEmpty(bo.getRanks()), GPatrolTeam::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) && bo.getUids().size() > 0 ? bo.getUids() : Arrays.asList(0L));
+
+        return lqw;
+    }
+
+    @Autowired
+    private IGPatrolTeamPhotoService service;
+
+    @Override
+    public Boolean insertByBo(GPatrolTeamBo bo) {
+        GPatrolTeam add = BeanUtil.toBean(bo, GPatrolTeam.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+            //添加照片
+            List<String> piclist = bo.getPhotoList();
+            if (piclist != null) {
+                for (int i = 0; i < bo.getPhotoList().size(); i++) {
+                    GPatrolTeamPhotoBo photo = new GPatrolTeamPhotoBo();
+                    photo.setParentId(bo.getId());
+                    photo.setPicUrl(bo.getPhotoList().get(i));
+                    service.insertByBo(photo);
+                }
+            }
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GPatrolTeamBo bo) {
+        GPatrolTeam update = BeanUtil.toBean(bo, GPatrolTeam.class);
+        validEntityBeforeSave(update);
+        List<String> piclist = bo.getPhotoList();
+        if (piclist != null) {
+            //原有的照片
+            List<String> photolist = baseMapper.getPhoto(bo.getId());
+            //原有的照片不在新传的照片里
+            List<String> dellist = photolist.stream().filter(i -> !piclist.contains(i)).collect(Collectors.toList());
+            //删除照片
+            if (dellist.size() > 0) {
+                service.deleteByUrl(bo.getId(), dellist);
+            }
+            //新传的照片不在原有的照片里
+            List<String> inslist = piclist.stream().filter(i -> !photolist.contains(i)).collect(Collectors.toList());
+            if (inslist.size() > 0) {
+                for (int i = 0; i < inslist.size(); i++) {
+                    if (StringUtils.isNotEmpty(inslist.get(i))) {
+                        //添加照片
+                        GPatrolTeamPhotoBo photo = new GPatrolTeamPhotoBo();
+                        photo.setParentId(bo.getId());
+                        photo.setPicUrl(inslist.get(i));
+                        service.insertByBo(photo);
+                    }
+                }
+            }
+        }
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GPatrolTeam entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatingBoxMaintenancePhotoServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.gas.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenancePhotoBo;
+import com.ruoyi.gas.domain.vo.GRegulatingBoxMaintenancePhotoVo;
+import com.ruoyi.gas.domain.GRegulatingBoxMaintenancePhoto;
+import com.ruoyi.gas.mapper.GRegulatingBoxMaintenancePhotoMapper;
+import com.ruoyi.gas.service.IGRegulatingBoxMaintenancePhotoService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 调压箱维护照片Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Service
+public class GRegulatingBoxMaintenancePhotoServiceImpl extends ServicePlusImpl<GRegulatingBoxMaintenancePhotoMapper, GRegulatingBoxMaintenancePhoto, GRegulatingBoxMaintenancePhotoVo> implements IGRegulatingBoxMaintenancePhotoService {
+    @Override
+    public void deleteByUrl(Long parentId, List<String> list) {
+        baseMapper.deleteByUrl(parentId, list);
+    }
+
+    @Override
+    public GRegulatingBoxMaintenancePhotoVo queryById(Long id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<GRegulatingBoxMaintenancePhotoVo> queryPageList(GRegulatingBoxMaintenancePhotoBo bo) {
+        PagePlus<GRegulatingBoxMaintenancePhoto, GRegulatingBoxMaintenancePhotoVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GRegulatingBoxMaintenancePhotoVo> queryList(GRegulatingBoxMaintenancePhotoBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GRegulatingBoxMaintenancePhoto> buildQueryWrapper(GRegulatingBoxMaintenancePhotoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GRegulatingBoxMaintenancePhoto> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getParentId() != null, GRegulatingBoxMaintenancePhoto::getParentId, bo.getParentId());
+        lqw.eq(StringUtils.isNotBlank(bo.getPicUrl()), GRegulatingBoxMaintenancePhoto::getPicUrl, bo.getPicUrl());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GRegulatingBoxMaintenancePhotoBo bo) {
+        GRegulatingBoxMaintenancePhoto add = BeanUtil.toBean(bo, GRegulatingBoxMaintenancePhoto.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GRegulatingBoxMaintenancePhotoBo bo) {
+        GRegulatingBoxMaintenancePhoto update = BeanUtil.toBean(bo, GRegulatingBoxMaintenancePhoto.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GRegulatingBoxMaintenancePhoto entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatingBoxMaintenanceServiceImpl.java

@@ -0,0 +1,153 @@
+package com.ruoyi.gas.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.PagePlus;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.gas.domain.GRegulatingBoxMaintenance;
+import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenanceBo;
+import com.ruoyi.gas.domain.bo.GRegulatingBoxMaintenancePhotoBo;
+import com.ruoyi.gas.domain.vo.GRegulatingBoxMaintenanceVo;
+import com.ruoyi.gas.mapper.GRegulatingBoxMaintenanceMapper;
+import com.ruoyi.gas.service.IGRegulatingBoxMaintenancePhotoService;
+import com.ruoyi.gas.service.IGRegulatingBoxMaintenanceService;
+import com.ruoyi.gas.service.IGUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 调压箱维护Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-05-09
+ */
+@Service
+public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegulatingBoxMaintenanceMapper, GRegulatingBoxMaintenance, GRegulatingBoxMaintenanceVo> implements IGRegulatingBoxMaintenanceService {
+
+    @Override
+    public GRegulatingBoxMaintenanceVo queryById(Long id) {
+
+        GRegulatingBoxMaintenanceVo voById = getVoById(id);
+        voById.setPhotoList(baseMapper.getPhoto(id));
+        voById.setCreateByName(baseMapper.getName(voById.getCreateBy()));
+        return voById;
+    }
+
+    @Autowired
+    private IGUserService gUserService;
+
+    @Override
+    public TableDataInfo<GRegulatingBoxMaintenanceVo> queryPageList(GRegulatingBoxMaintenanceBo bo) {
+        String ranks = bo.getRanks();
+        if (StringUtils.isNotEmpty(ranks)) {
+            bo.setUids(gUserService.getByRanks(ranks));
+        }
+        PagePlus<GRegulatingBoxMaintenance, GRegulatingBoxMaintenanceVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        result.getRecordsVo().forEach(item -> {
+            item.setPhotoList(baseMapper.getPhoto(item.getId()));
+            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
+        });
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GRegulatingBoxMaintenanceVo> queryList(GRegulatingBoxMaintenanceBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+
+    private LambdaQueryWrapper<GRegulatingBoxMaintenance> buildQueryWrapper(GRegulatingBoxMaintenanceBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GRegulatingBoxMaintenance> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), GRegulatingBoxMaintenance::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getNumber()), GRegulatingBoxMaintenance::getNumber, bo.getNumber());
+        lqw.eq(StringUtils.isNotBlank(bo.getAdministrativeOffice()), GRegulatingBoxMaintenance::getAdministrativeOffice, bo.getAdministrativeOffice());
+        lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceItem()), GRegulatingBoxMaintenance::getMaintenanceItem, bo.getMaintenanceItem());
+        lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), GRegulatingBoxMaintenance::getRemarks, bo.getRemarks());
+        lqw.in(StringUtils.isNotEmpty(bo.getRanks()), GRegulatingBoxMaintenance::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) && bo.getUids().size() > 0 ? bo.getUids() : Arrays.asList(0L));
+        lqw.orderByDesc(GRegulatingBoxMaintenance::getCreateTime);
+        return lqw;
+    }
+
+    @Autowired
+    private IGRegulatingBoxMaintenancePhotoService service;
+
+    @Override
+    public Boolean insertByBo(GRegulatingBoxMaintenanceBo bo) {
+        GRegulatingBoxMaintenance add = BeanUtil.toBean(bo, GRegulatingBoxMaintenance.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+            //添加照片
+            List<String> piclist = bo.getPhotoList();
+            if (piclist != null) {
+                for (int i = 0; i < bo.getPhotoList().size(); i++) {
+                    GRegulatingBoxMaintenancePhotoBo photo = new GRegulatingBoxMaintenancePhotoBo();
+                    photo.setParentId(bo.getId());
+                    photo.setPicUrl(bo.getPhotoList().get(i));
+                    service.insertByBo(photo);
+                }
+            }
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GRegulatingBoxMaintenanceBo bo) {
+        GRegulatingBoxMaintenance update = BeanUtil.toBean(bo, GRegulatingBoxMaintenance.class);
+        validEntityBeforeSave(update);
+        List<String> piclist = bo.getPhotoList();
+        if (piclist != null) {
+            //原有的照片
+            List<String> photolist = baseMapper.getPhoto(bo.getId());
+            //原有的照片不在新传的照片里
+            List<String> dellist = photolist.stream().filter(i -> !piclist.contains(i)).collect(Collectors.toList());
+            //删除照片
+            if (dellist.size() > 0) {
+                service.deleteByUrl(bo.getId(), dellist);
+            }
+            //新传的照片不在原有的照片里
+            List<String> inslist = piclist.stream().filter(i -> !photolist.contains(i)).collect(Collectors.toList());
+            if (inslist.size() > 0) {
+                for (int i = 0; i < inslist.size(); i++) {
+                    if (StringUtils.isNotEmpty(inslist.get(i))) {
+                        //添加照片
+                        GRegulatingBoxMaintenancePhotoBo photo = new GRegulatingBoxMaintenancePhotoBo();
+                        photo.setParentId(bo.getId());
+                        photo.setPicUrl(inslist.get(i));
+                        service.insertByBo(photo);
+                    }
+                }
+            }
+        }
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GRegulatingBoxMaintenance entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return removeByIds(ids);
+    }
+}

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRoadSectionInspectionServiceImpl.java

@@ -15,9 +15,12 @@ import com.ruoyi.gas.domain.vo.GRoadSectionInspectionVo;
 import com.ruoyi.gas.mapper.GRoadSectionInspectionMapper;
 import com.ruoyi.gas.service.IGRoadSectionInspectionPhotoService;
 import com.ruoyi.gas.service.IGRoadSectionInspectionService;
+import com.ruoyi.gas.service.IGUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -39,13 +42,19 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
         return voById;
     }
 
+    @Autowired
+    private IGUserService gUserService;
+
     @Override
     public TableDataInfo<GRoadSectionInspectionVo> queryPageList(GRoadSectionInspectionBo bo) {
+        String ranks = bo.getRanks();
+        if (StringUtils.isNotEmpty(ranks)) {
+            bo.setUids(gUserService.getByRanks(ranks));
+        }
         PagePlus<GRoadSectionInspection, GRoadSectionInspectionVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
         TableDataInfo<GRoadSectionInspectionVo> tableDataInfo = PageUtils.buildDataInfo(result);
         tableDataInfo.getRows().forEach(item -> {
-            item.setPhotoList(
-                    baseMapper.getPhoto(item.getId()));
+            item.setPhotoList(baseMapper.getPhoto(item.getId()));
             item.setCreateByName(baseMapper.getName(item.getCreateBy()));
         });
         return tableDataInfo;
@@ -63,6 +72,7 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
         lqw.eq(StringUtils.isNotBlank(bo.getSamplingMeterCount()), GRoadSectionInspection::getSamplingMeterCount, bo.getSamplingMeterCount());
         lqw.eq(StringUtils.isNotBlank(bo.getFindProblem()), GRoadSectionInspection::getFindProblem, bo.getFindProblem());
         lqw.eq(bo.getFindTime() != null, GRoadSectionInspection::getFindTime, bo.getFindTime());
+        lqw.in(StringUtils.isNotEmpty(bo.getRanks()), GRoadSectionInspection::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) && bo.getUids().size() > 0 ? bo.getUids() : Arrays.asList(0L));
         return lqw;
     }
 

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GUserServiceImpl.java

@@ -1,29 +1,29 @@
 package com.ruoyi.gas.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.enums.Constants;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.Constants;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.gas.domain.GUser;
+import com.ruoyi.gas.domain.bo.GUserBo;
 import com.ruoyi.gas.domain.vo.GCensusVo;
 import com.ruoyi.gas.domain.vo.GUserForemanVo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.ruoyi.gas.domain.bo.GUserBo;
 import com.ruoyi.gas.domain.vo.GUserVo;
-import com.ruoyi.gas.domain.GUser;
 import com.ruoyi.gas.mapper.GUserMapper;
 import com.ruoyi.gas.service.IGUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
 
 /**
  * 用户Service业务层处理
@@ -43,6 +43,11 @@ public class GUserServiceImpl extends ServicePlusImpl<GUserMapper, GUser, GUserV
     }
 
     @Override
+    public List<Long> getByRanks(String ranks) {
+        return baseMapper.getByRanks(ranks);
+    }
+
+    @Override
     public TableDataInfo<GUserVo> queryPageList(GUserBo bo) {
         PagePlus<GUser, GUserVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
         return PageUtils.buildDataInfo(result);

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GValveWellInspectionServiceImpl.java

@@ -3,8 +3,8 @@ package com.ruoyi.gas.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -12,6 +12,7 @@ import com.ruoyi.gas.domain.GValveWellInspection;
 import com.ruoyi.gas.domain.bo.GValveWellInspectionBo;
 import com.ruoyi.gas.domain.bo.GValveWellInspectionPhotoBo;
 import com.ruoyi.gas.domain.vo.GValveWellInspectionVo;
+import com.ruoyi.gas.domain.vo.GValveWellInspectionVos;
 import com.ruoyi.gas.mapper.GValveWellInspectionMapper;
 import com.ruoyi.gas.mapper.GValveWellPositionMapper;
 import com.ruoyi.gas.service.IGValveWellInspectionPhotoService;
@@ -46,15 +47,12 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
     }
 
     @Override
-    public TableDataInfo<GValveWellInspectionVo> queryPageList(GValveWellInspectionBo bo) {
-        PagePlus<GValveWellInspection, GValveWellInspectionVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
-        TableDataInfo<GValveWellInspectionVo> tableDataInfo = PageUtils.buildDataInfo(result);
-        tableDataInfo.getRows().forEach(item -> {
-            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
-            item.setPhotoList(baseMapper.getPhoto(item.getId()));
-            item.setPosition(positionMapper.selectById(item.getPositionId()));
-        });
-        return tableDataInfo;
+    public TableDataInfo<GValveWellInspectionVos> queryPageList(GValveWellInspectionBo bo) {
+        Page<GValveWellInspectionVos> page = new Page<>(bo.getPageNum(), bo.getPageSize());
+        Page<GValveWellInspectionVos> list = baseMapper.getList(bo, page);
+        list.getRecords().forEach(item -> item.setPhotoList(baseMapper.getPhoto(item.getId())));
+        return PageUtils.buildDataInfo(list);
+
     }
 
     @Override
@@ -66,6 +64,7 @@ public class GValveWellInspectionServiceImpl extends ServicePlusImpl<GValveWellI
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<GValveWellInspection> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getPositionId() != null, GValveWellInspection::getPositionId, bo.getPositionId());
+        lqw.eq(bo.getValveWellName() != null, GValveWellInspection::getPositionId, bo.getValveWellName());
         lqw.eq(StringUtils.isNotBlank(bo.getDiscoverProblems()), GValveWellInspection::getDiscoverProblems, bo.getDiscoverProblems());
         lqw.eq(bo.getDiscoverTime() != null, GValveWellInspection::getDiscoverTime, bo.getDiscoverTime());
         return lqw;

ruoyi-gas/src/main/resources/mapper/GCourtyardNetworkManagementMapper.xml

@@ -39,6 +39,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.findProblem != null  and p.findProblem != ''">
                 and a.find_problem = #{p.findProblem}
             </if>
+            <if test="p.areaName != null  and p.areaName != ''">
+                and d.name LIKE concat('%', #{p.areaName}, '%')
+            </if>
             <if test="p.createBy != null  and p.createBy != ''">
                 and a.create_by = #{p.createBy}
             </if>

ruoyi-gas/src/main/resources/mapper/GPatrolTeamMapper.xml

@@ -0,0 +1,30 @@
+<?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.ruoyi.gas.mapper.GPatrolTeamMapper">
+
+    <resultMap type="com.ruoyi.gas.domain.GPatrolTeam" id="GPatrolTeamResult">
+        <result property="id" column="id"/>
+        <result property="team" column="team"/>
+        <result property="uploadLocation" column="upload_location"/>
+        <result property="isNormalInspection" column="is_normal_inspection"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="getPhoto" resultType="java.lang.String">
+        select pic_url AS picUrl
+        from g_patrol_team_photo
+        where parent_id = #{id}
+          and del_flag = '0'
+    </select>
+
+    <select id="getName" resultType="java.lang.String">
+        SELECT name FROM g_user WHERE id = #{id}
+                                  and del_flag = '0'
+    </select>
+</mapper>

ruoyi-gas/src/main/resources/mapper/GPatrolTeamPhotoMapper.xml

@@ -0,0 +1,25 @@
+<?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.ruoyi.gas.mapper.GPatrolTeamPhotoMapper">
+
+    <resultMap type="com.ruoyi.gas.domain.GPatrolTeamPhoto" id="GPatrolTeamPhotoResult">
+        <result property="id" column="id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="picUrl" column="pic_url"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+    <delete id="deleteByUrl" parameterType="String">
+        delete from g_patrol_team_photo where parent_id = #{parentId}
+        and pic_url in
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-gas/src/main/resources/mapper/GRegulatingBoxMaintenanceMapper.xml

@@ -0,0 +1,32 @@
+<?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.ruoyi.gas.mapper.GRegulatingBoxMaintenanceMapper">
+
+    <resultMap type="com.ruoyi.gas.domain.GRegulatingBoxMaintenance" id="GRegulatingBoxMaintenanceResult">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="number" column="number"/>
+        <result property="administrativeOffice" column="administrative_office"/>
+        <result property="maintenanceItem" column="maintenance_item"/>
+        <result property="remarks" column="remarks"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <select id="getPhoto" resultType="java.lang.String">
+        select pic_url AS picUrl
+        from g_regulating_box_maintenance_photo
+        where parent_id = #{id}
+          and del_flag = '0'
+    </select>
+
+    <select id="getName" resultType="java.lang.String">
+        SELECT name FROM g_user WHERE id = #{id}
+                                  and del_flag = '0'
+    </select>
+</mapper>

ruoyi-gas/src/main/resources/mapper/GRegulatingBoxMaintenancePhotoMapper.xml

@@ -0,0 +1,26 @@
+<?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.ruoyi.gas.mapper.GRegulatingBoxMaintenancePhotoMapper">
+
+    <resultMap type="com.ruoyi.gas.domain.GRegulatingBoxMaintenancePhoto" id="GRegulatingBoxMaintenancePhotoResult">
+        <result property="id" column="id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="picUrl" column="pic_url"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <delete id="deleteByUrl" parameterType="String">
+        delete from g_regulating_box_maintenance_photo where parent_id = #{parentId}
+        and pic_url in
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+</mapper>

ruoyi-gas/src/main/resources/mapper/GRegulatorBoxMapper.xml

@@ -82,6 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="p.ranks != null and p.ranks != ''">
                 and u.ranks = #{p.ranks}
             </if>
+            <if test="p.name != null and p.name != ''">
+                and a.name LIKE concat('%', #{p.name}, '%')
+            </if>
         </where>
         ORDER BY a.create_time DESC
     </select>

ruoyi-gas/src/main/resources/mapper/GUserMapper.xml

@@ -110,4 +110,10 @@
             and id != #{id}
         </if>
     </select>
+
+    <select id="getByRanks" resultType="java.lang.Long">
+        select id from g_user
+        where ranks = #{ranks}
+        and del_flag = '0'
+    </select>
 </mapper>

ruoyi-gas/src/main/resources/mapper/GValveWellInspectionMapper.xml

@@ -16,7 +16,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
     </resultMap>
-
+    <select id="getList" resultType="com.ruoyi.gas.domain.vo.GValveWellInspectionVos">
+        SELECT
+        vwi.id,
+        vwp.valve_well_name,
+        vwp.position AS positionName,
+        u.name AS createByName,
+        vwi.discover_problems,
+        vwi.remark,
+        vwi.remarks,
+        vwi.process_status,
+        vwi.create_time
+        FROM
+        g_valve_well_inspection vwi
+        LEFT JOIN g_valve_well_position vwp ON vwp.id = vwi.position_id
+        LEFT JOIN g_user u ON u.id = vwi.create_by
+        WHERE
+        vwi.del_flag = '0'
+        <if test="p.valveWellName != null and p.valveWellName != ''">
+            AND vwp.valve_well_name LIKE concat('%', #{p.valveWellName}, '%')
+        </if>
+        <if test="p.positionId != null and p.positionId != ''">
+            AND vwi.position_id = #{p.positionId}
+        </if>
+        <if test="p.ranks != null  and p.ranks != ''">
+            and u.ranks = #{p.ranks}
+        </if>
+        <if test="p.discoverProblems != null and p.discoverProblems != ''">
+            AND vwi.discover_problems = #{p.discoverProblems}
+        </if>
+        ORDER BY
+        vwi.create_time DESC
+    </select>
     <select id="getPhoto" resultType="java.lang.String">
         select pic_url AS picUrl
         from g_valve_well_inspection_photo