新增：巡检车队

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-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/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/bo/GPatrolTeamBo.java

@@ -0,0 +1,80 @@
+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;
+    /**
+     *
+     */
+    @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/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/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/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/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,138 @@
+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 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.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;
+    }
+
+    @Override
+    public TableDataInfo<GPatrolTeamVo> queryPageList(GPatrolTeamBo bo) {
+        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());
+        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/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>