提交代码

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

@@ -17,7 +17,6 @@ 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.*;
 
@@ -46,7 +45,7 @@ public class MPipelineGasUserController extends BaseController {
      * 查询非居民巡查列表
      */
     @ApiOperation("查询非居民巡查列表")
-    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:list')")
+//    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:list')")
     @GetMapping("/list")
     public TableDataInfo<GPipelineGasUserVo> list(@Validated(QueryGroup.class) GPipelineGasUserBo bo) {
         return iGPipelineGasUserService.queryPageList(bo);
@@ -56,7 +55,7 @@ public class MPipelineGasUserController extends BaseController {
      * 导出非居民巡查列表
      */
     @ApiOperation("导出非居民巡查列表")
-    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:export')")
+//    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:export')")
     @Log(title = "非居民巡查", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public void export(@Validated GPipelineGasUserBo bo, HttpServletResponse response) {
@@ -68,7 +67,7 @@ public class MPipelineGasUserController extends BaseController {
      * 获取非居民巡查详细信息
      */
     @ApiOperation("获取非居民巡查详细信息")
-    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:query')")
+//    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:query')")
     @GetMapping("/{id}")
     public AjaxResult<GPipelineGasUserVo> getInfo(@NotNull(message = "主键不能为空")
                                                   @PathVariable("id") Long id) {
@@ -79,7 +78,7 @@ public class MPipelineGasUserController extends BaseController {
      * 新增非居民巡查
      */
     @ApiOperation("新增非居民巡查")
-    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:add')")
+//    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:add')")
     @Log(title = "非居民巡查", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -91,7 +90,7 @@ public class MPipelineGasUserController extends BaseController {
      * 修改非居民巡查
      */
     @ApiOperation("修改非居民巡查")
-    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:edit')")
     @Log(title = "非居民巡查", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -103,7 +102,7 @@ public class MPipelineGasUserController extends BaseController {
      * 删除非居民巡查
      */
     @ApiOperation("删除非居民巡查")
-    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:remove')")
+//    @PreAuthorize("@ss.hasPermi('system:pipelineGasUser:remove')")
     @Log(title = "非居民巡查" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -191,5 +191,13 @@ public class GPipelineGasUser extends BaseEntity {
      */
     private String connectingPipeB;
     private String emergencyShutB;
+    /**
+     * 管道详情
+     */
+    private String pipelineLabel;
+    /**
+     * 队伍
+     */
+    private String team;
 
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/GPipelineGasUserPhoto.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_pipeline_gas_user_photo
+ *
+ * @author ruoyi
+ * @date 2024-05-17
+ */
+@Data
+@Accessors(chain = true)
+@TableName("g_pipeline_gas_user_photo")
+public class GPipelineGasUserPhoto extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 非居民id
+     */
+    private Long pipelineId;
+    /**
+     * 照片
+     */
+    private String picUrl;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+}

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

@@ -1,5 +1,6 @@
 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;
@@ -11,6 +12,7 @@ import lombok.EqualsAndHashCode;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 非居民巡查业务对象 g_pipeline_gas_user
@@ -256,6 +258,7 @@ public class GPipelineGasUserBo extends BaseEntity {
      */
     @ApiModelProperty(value = "安检时间", required = true)
     // @NotNull(message = "安检时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     private Date securityCheckTime;
 
     /**
@@ -340,5 +343,15 @@ public class GPipelineGasUserBo extends BaseEntity {
     @ApiModelProperty(value = "可燃气体报警器装置", required = true)
     //  @NotBlank(message = "可燃气体报警器装置不能为空", groups = { AddGroup.class, EditGroup.class })
     private String combustibleGasB;
+    @ApiModelProperty(value = "管道详情", required = true)
+    private String pipelineLabel;
+    /**
+     * 照片
+     */
+    private List<String> photoList;
+    /**
+     * 队伍
+     */
+    private String team;
 
 }

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

@@ -0,0 +1,72 @@
+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;
+
+/**
+ * 调压箱照片业务对象 g_pipeline_gas_user_photo
+ *
+ * @author ruoyi
+ * @date 2024-05-17
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("调压箱照片业务对象")
+public class GPipelineGasUserPhotoBo 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 pipelineId;
+
+    /**
+     * 照片
+     */
+    @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/GPipelineGasUserPhotoVo.java

@@ -0,0 +1,46 @@
+package com.ruoyi.gas.domain.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+
+/**
+ * 调压箱照片视图对象 g_pipeline_gas_user_photo
+ *
+ * @author ruoyi
+ * @date 2024-05-17
+ */
+@Data
+@ApiModel("调压箱照片视图对象")
+@ExcelIgnoreUnannotated
+public class GPipelineGasUserPhotoVo {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+	@ExcelProperty(value = "主键id")
+	@ApiModelProperty("主键id")
+	private Long id;
+
+    /**
+     * 非居民id
+     */
+	@ExcelProperty(value = "非居民id")
+	@ApiModelProperty("非居民id")
+	private Long pipelineId;
+
+    /**
+     * 照片
+     */
+	@ExcelProperty(value = "照片")
+	@ApiModelProperty("照片")
+	private String picUrl;
+
+
+}

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

@@ -2,13 +2,13 @@ package com.ruoyi.gas.domain.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
-
-
+import java.util.List;
 
 /**
  * 非居民巡查视图对象 g_pipeline_gas_user
@@ -19,7 +19,7 @@ import java.util.Date;
 @Data
 @ApiModel("非居民巡查视图对象")
 @ExcelIgnoreUnannotated
-public class GPipelineGasUserVo {
+public class GPipelineGasUserVo extends BaseEntity {
 
 	private static final long serialVersionUID = 1L;
 
@@ -29,6 +29,7 @@ public class GPipelineGasUserVo {
 	@ExcelProperty(value = "主键id")
 	@ApiModelProperty("主键id")
 	private Long id;
+	private String createByName;
 
     /**
      * 用户名称
@@ -99,6 +100,12 @@ public class GPipelineGasUserVo {
 	@ExcelProperty(value = "管道")
 	@ApiModelProperty("管道")
 	private String pipeline;
+	/**
+	 * 管道详情
+	 */
+	@ExcelProperty(value = "管道")
+	@ApiModelProperty("管道")
+	private String pipelineLabel;
 
     /**
      * 计量表具
@@ -321,6 +328,14 @@ public class GPipelineGasUserVo {
 	@ExcelProperty(value = "电线缠绕label")
 	@ApiModelProperty("电线缠绕label")
 	private String wireTangleLabel;
+	/**
+	 * 照片
+	 */
+	private List<String> photoList;
+	/**
+	 * 队伍
+	 */
+	private String team;
 
 
 }

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

@@ -3,6 +3,8 @@ package com.ruoyi.gas.mapper;
 import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
 import com.ruoyi.gas.domain.GPipelineGasUser;
 
+import java.util.List;
+
 /**
  * 非居民巡查Mapper接口
  *
@@ -10,5 +12,6 @@ import com.ruoyi.gas.domain.GPipelineGasUser;
  * @date 2024-05-16
  */
 public interface GPipelineGasUserMapper extends BaseMapperPlus<GPipelineGasUser> {
-
+    List<String> getPhoto(Long id);
+    String getName(String id);
 }

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

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

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

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

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

@@ -16,7 +16,9 @@ import java.util.List;
  * @date 2024-05-16
  */
 public interface IGPipelineGasUserService extends IServicePlus<GPipelineGasUser, GPipelineGasUserVo> {
+
 	/**
+	 *
 	 * 查询单个
 	 * @return
 	 */

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

@@ -0,0 +1,92 @@
+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.GPipelineGasUserPhoto;
+import com.ruoyi.gas.domain.bo.GPipelineGasUserPhotoBo;
+import com.ruoyi.gas.domain.vo.GPipelineGasUserPhotoVo;
+import com.ruoyi.gas.mapper.GPipelineGasUserPhotoMapper;
+import com.ruoyi.gas.service.IGPipelineGasUserPhotoService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 调压箱照片Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2024-05-17
+ */
+@Service
+public class GPipelineGasUserPhotoServiceImpl extends ServicePlusImpl<GPipelineGasUserPhotoMapper, GPipelineGasUserPhoto, GPipelineGasUserPhotoVo> implements IGPipelineGasUserPhotoService {
+
+    @Override
+    public GPipelineGasUserPhotoVo queryById(Long id){
+        return getVoById(id);
+    }
+
+    @Override
+    public TableDataInfo<GPipelineGasUserPhotoVo> queryPageList(GPipelineGasUserPhotoBo bo) {
+        PagePlus<GPipelineGasUserPhoto, GPipelineGasUserPhotoVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+        return PageUtils.buildDataInfo(result);
+    }
+
+    @Override
+    public List<GPipelineGasUserPhotoVo> queryList(GPipelineGasUserPhotoBo bo) {
+        return listVo(buildQueryWrapper(bo));
+    }
+    @Override
+    public void deleteByUrl(Long parentId, List<String> list) {
+        baseMapper.deleteByUrl(parentId,list);
+    }
+    private LambdaQueryWrapper<GPipelineGasUserPhoto> buildQueryWrapper(GPipelineGasUserPhotoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<GPipelineGasUserPhoto> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getPipelineId() != null, GPipelineGasUserPhoto::getPipelineId, bo.getPipelineId());
+        lqw.eq(StringUtils.isNotBlank(bo.getPicUrl()), GPipelineGasUserPhoto::getPicUrl, bo.getPicUrl());
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(GPipelineGasUserPhotoBo bo) {
+        GPipelineGasUserPhoto add = BeanUtil.toBean(bo, GPipelineGasUserPhoto.class);
+        validEntityBeforeSave(add);
+        boolean flag = save(add);
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(GPipelineGasUserPhotoBo bo) {
+        GPipelineGasUserPhoto update = BeanUtil.toBean(bo, GPipelineGasUserPhoto.class);
+        validEntityBeforeSave(update);
+        return updateById(update);
+    }
+
+    /**
+     * 保存前的数据校验
+     *
+     * @param entity 实体类数据
+     */
+    private void validEntityBeforeSave(GPipelineGasUserPhoto 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/GPipelineGasUserServiceImpl.java

@@ -10,14 +10,18 @@ import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.GPipelineGasUser;
 import com.ruoyi.gas.domain.bo.GPipelineGasUserBo;
+import com.ruoyi.gas.domain.bo.GPipelineGasUserPhotoBo;
 import com.ruoyi.gas.domain.vo.GPipelineGasUserVo;
 import com.ruoyi.gas.mapper.GPipelineGasUserMapper;
+import com.ruoyi.gas.service.IGPipelineGasUserPhotoService;
 import com.ruoyi.gas.service.IGPipelineGasUserService;
+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业务层处理
@@ -28,19 +32,38 @@ import java.util.Map;
 @Service
 public class GPipelineGasUserServiceImpl extends ServicePlusImpl<GPipelineGasUserMapper, GPipelineGasUser, GPipelineGasUserVo> implements IGPipelineGasUserService {
 
+
+    @Autowired
+    private IGPipelineGasUserPhotoService service;
+
     @Override
     public GPipelineGasUserVo queryById(Long id){
-        return getVoById(id);
+        GPipelineGasUserVo voById = getVoById(id);
+        voById.setPhotoList(baseMapper.getPhoto(id));
+//        voById.setCreateByName(baseMapper.getName(voById.getCreateBy()));
+        return voById;
     }
 
     @Override
     public TableDataInfo<GPipelineGasUserVo> queryPageList(GPipelineGasUserBo bo) {
         PagePlus<GPipelineGasUser, GPipelineGasUserVo> 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<GPipelineGasUserVo> queryList(GPipelineGasUserBo bo) {
+//        if (StringUtils.isNotEmpty(ranks)) {
+//            bo.setUids(gUserService.getByRanks(ranks));
+//        }
+//        PagePlus<GPatrolTeam, G> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
+//        result.getRecordsVo().forEach(item -> {
+//            item.setPhotoList(baseMapper.getPhoto(item.getId()));
+//            item.setCreateByName(baseMapper.getName(item.getCreateBy()));
+//        });
         return listVo(buildQueryWrapper(bo));
     }
 
@@ -76,6 +99,7 @@ public class GPipelineGasUserServiceImpl extends ServicePlusImpl<GPipelineGasUse
         lqw.eq(StringUtils.isNotBlank(bo.getWireTangle()), GPipelineGasUser::getWireTangle, bo.getWireTangle());
         lqw.eq(StringUtils.isNotBlank(bo.getOther()), GPipelineGasUser::getOther, bo.getOther());
         lqw.eq(StringUtils.isNotBlank(bo.getSecurityCheckOne()), GPipelineGasUser::getSecurityCheckOne, bo.getSecurityCheckOne());
+        lqw.eq(StringUtils.isNotBlank(bo.getTeam()), GPipelineGasUser::getTeam, bo.getTeam());
         lqw.eq(StringUtils.isNotBlank(bo.getSecurityCheckTwo()), GPipelineGasUser::getSecurityCheckTwo, bo.getSecurityCheckTwo());
         lqw.eq(StringUtils.isNotBlank(bo.getSecurityCheckUser()), GPipelineGasUser::getSecurityCheckUser, bo.getSecurityCheckUser());
         lqw.eq(bo.getSecurityCheckTime() != null, GPipelineGasUser::getSecurityCheckTime, bo.getSecurityCheckTime());
@@ -86,9 +110,11 @@ public class GPipelineGasUserServiceImpl extends ServicePlusImpl<GPipelineGasUse
         lqw.eq(StringUtils.isNotBlank(bo.getMixingGasesLabel()), GPipelineGasUser::getMixingGasesLabel, bo.getMixingGasesLabel());
         lqw.eq(StringUtils.isNotBlank(bo.getHeavyHangingLabel()), GPipelineGasUser::getHeavyHangingLabel, bo.getHeavyHangingLabel());
         lqw.eq(StringUtils.isNotBlank(bo.getWireTangleLabel()), GPipelineGasUser::getWireTangleLabel, bo.getWireTangleLabel());
+        lqw.orderByAsc(GPipelineGasUser::getCreateTime);
         return lqw;
     }
 
+
     @Override
     public Boolean insertByBo(GPipelineGasUserBo bo) {
         GPipelineGasUser add = BeanUtil.toBean(bo, GPipelineGasUser.class);
@@ -96,6 +122,16 @@ public class GPipelineGasUserServiceImpl extends ServicePlusImpl<GPipelineGasUse
         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++) {
+                    GPipelineGasUserPhotoBo photo = new GPipelineGasUserPhotoBo();
+                    photo.setPipelineId(bo.getId());
+                    photo.setPicUrl(bo.getPhotoList().get(i));
+                    service.insertByBo(photo);
+                }
+            }
         }
         return flag;
     }
@@ -104,6 +140,30 @@ public class GPipelineGasUserServiceImpl extends ServicePlusImpl<GPipelineGasUse
     public Boolean updateByBo(GPipelineGasUserBo bo) {
         GPipelineGasUser update = BeanUtil.toBean(bo, GPipelineGasUser.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))) {
+                        //添加照片
+                        GPipelineGasUserPhotoBo photo = new GPipelineGasUserPhotoBo();
+                        photo.setPipelineId(bo.getId());
+                        photo.setPicUrl(inslist.get(i));
+                        service.insertByBo(photo);
+                    }
+                }
+            }
+        }
         return updateById(update);
     }
 

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

@@ -48,7 +48,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="mixingGasesLabel" column="mixing_gases_label"/>
         <result property="heavyHangingLabel" column="heavy_hanging_label"/>
         <result property="wireTangleLabel" column="wire_tangle_label"/>
+        <result property="team" column="team"/>
     </resultMap>
-
+    <select id="getPhoto" resultType="java.lang.String">
+        select pic_url AS picUrl
+        from g_pipeline_gas_user_photo
+        where pipeline_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/GPipelineGasUserPhotoMapper.xml

@@ -0,0 +1,24 @@
+<?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.GPipelineGasUserPhotoMapper">
+
+    <resultMap type="com.ruoyi.gas.domain.GPipelineGasUserPhoto" id="GPipelineGasUserPhotoResult">
+        <result property="id" column="id"/>
+        <result property="pipelineId" column="pipeline_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_pipeline_gas_user_photo where pipeline_id = #{parentId}
+        and pic_url in
+        <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+</mapper>