refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块

- 移动AppBusinessFile相关类到equipment模块
- 移动AppOperationVideo相关类到equipment模块
- 更新所有导入路径以指向新的equipment包结构
- 重构设备创建流程中的文件克隆逻辑
- 添加cloneFiles方法支持从设备类型复制文件和视频到新设备
- 优化DeviceXinghanBizService中的设备验证逻辑
- 更新Mapper XML命名空间和返回类型引用
- 调整设备导入Excel的必填字段验证规则
This commit is contained in:
2026-02-27 15:13:53 +08:00
parent 346792d5c1
commit e23c5267ee
26 changed files with 186 additions and 115 deletions

View File

@ -317,8 +317,7 @@ public class DeviceController extends BaseController {
// 定义必需的表头
Set<String> requiredHeaders = new HashSet<>(Arrays.asList(
"设备名称", "设备类型名称", "设备图片", "设备MAC", "蓝牙名称", "设备IMEI",
"备注", "是否支持蓝牙", "定位方式", "通讯方式",
"型号字典用于APP页面跳转", "型号字典用于PC页面跳转"
"备注"
));
// 检查必需的表头是否都存在

View File

@ -0,0 +1,51 @@
package com.fuyuanshen.equipment.domain;
import com.fuyuanshen.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* app业务文件对象 app_business_file
*
* @author Lion Li
* @date 2025-07-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("app_business_file")
public class AppBusinessFile extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id")
private Long id;
/**
* 文件id
*/
private Long fileId;
/**
* 业务id
*/
private Long businessId;
/**
* 文件类型(1:操作说明2:产品参数)
*/
private Long fileType;
/**
* 备注
*/
private String remark;
}

View File

@ -0,0 +1,51 @@
package com.fuyuanshen.equipment.domain;
import com.fuyuanshen.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serial;
/**
* 操作视频对象 app_operation_video
*
* @author Lion Li
* @date 2025-07-02
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("app_operation_video")
public class AppOperationVideo extends TenantEntity {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(value = "id")
private Long id;
/**
* 视频名称
*/
private String videoName;
/**
* 视频链接
*/
private String videoUrl;
/**
* 设备di
*/
private Long deviceId;
/**
* 备注
*/
private String remark;
}

View File

@ -0,0 +1,52 @@
package com.fuyuanshen.equipment.domain.bo;
import com.fuyuanshen.equipment.domain.AppBusinessFile;
import com.fuyuanshen.common.core.validate.EditGroup;
import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.List;
/**
* app业务文件业务对象 app_business_file
*
* @author Lion Li
* @date 2025-07-03
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = AppBusinessFile.class, reverseConvertGenerate = false)
public class AppBusinessFileBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 文件id
*/
private Long fileId;
/**
* 业务id
*/
private Long businessId;
/**
* 文件类型(1:操作说明2:产品参数)
*/
private Long fileType;
/**
* 备注
*/
private String remark;
private List<Long> ids;
}

View File

@ -0,0 +1,54 @@
package com.fuyuanshen.equipment.domain.bo;
import com.fuyuanshen.equipment.domain.AppOperationVideo;
import com.fuyuanshen.common.core.validate.EditGroup;
import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
/**
* 操作视频业务对象 app_operation_video
*
* @author Lion Li
* @date 2025-07-02
*/
@Data
@EqualsAndHashCode(callSuper = true)
@AutoMapper(target = AppOperationVideo.class, reverseConvertGenerate = false)
public class AppOperationVideoBo extends BaseEntity {
/**
* 主键id
*/
@NotNull(message = "主键id不能为空", groups = { EditGroup.class })
private Long id;
/**
* 视频名称
*/
private String videoName;
/**
* 视频链接
*/
private String videoUrl;
/**
* 设备di
*/
private Long deviceId;
/**
* 备注
*/
private String remark;
/**
* 多设备id
*/
private Long[] deviceIds;
}

View File

@ -0,0 +1,58 @@
package com.fuyuanshen.equipment.domain.vo;
import com.fuyuanshen.equipment.domain.AppBusinessFile;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* app业务文件视图对象 app_business_file
*
* @author Lion Li
* @date 2025-07-03
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = AppBusinessFile.class)
public class AppBusinessFileVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 文件id
*/
@ExcelProperty(value = "文件id")
private Long fileId;
/**
* 业务id
*/
@ExcelProperty(value = "业务id")
private Long businessId;
/**
* 文件类型(1:操作说明2:产品参数)
*/
@ExcelProperty(value = "文件类型(1:操作说明2:产品参数)")
private Long fileType;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

View File

@ -0,0 +1,30 @@
package com.fuyuanshen.equipment.domain.vo;
import lombok.Data;
@Data
public class AppFileVo {
private Long id;
/**
* 业务id
*/
private String businessId;
/**
* 文件id
*/
private Long fileId;
/**
* 文件名称
*/
private String fileName;
/**
* 文件类型(1:操作说明2:产品参数)
*/
private Long fileType;
/**
* 文件url
*/
private String fileUrl;
}

View File

@ -0,0 +1,58 @@
package com.fuyuanshen.equipment.domain.vo;
import com.fuyuanshen.equipment.domain.AppOperationVideo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
/**
* 操作视频视图对象 app_operation_video
*
* @author Lion Li
* @date 2025-07-02
*/
@Data
@ExcelIgnoreUnannotated
@AutoMapper(target = AppOperationVideo.class)
public class AppOperationVideoVo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@ExcelProperty(value = "主键id")
private Long id;
/**
* 视频名称
*/
@ExcelProperty(value = "视频名称")
private String videoName;
/**
* 视频链接
*/
@ExcelProperty(value = "视频链接")
private String videoUrl;
/**
* 设备di
*/
@ExcelProperty(value = "设备di")
private Long deviceId;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}

View File

@ -0,0 +1,20 @@
package com.fuyuanshen.equipment.mapper;
import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
import com.fuyuanshen.equipment.domain.AppBusinessFile;
import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
import com.fuyuanshen.equipment.domain.vo.AppBusinessFileVo;
import com.fuyuanshen.equipment.domain.vo.AppFileVo;
import java.util.List;
/**
* app业务文件Mapper接口
*
* @author Lion Li
* @date 2025-07-03
*/
public interface AppBusinessFileMapper extends BaseMapperPlus<AppBusinessFile, AppBusinessFileVo> {
List<AppFileVo> queryAppFileList(AppBusinessFileBo bo);
}

View File

@ -0,0 +1,17 @@
package com.fuyuanshen.equipment.mapper;
import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
import com.fuyuanshen.equipment.domain.AppOperationVideo;
import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;
import org.apache.ibatis.annotations.Mapper;
/**
* 操作视频Mapper接口
*
* @author Lion Li
* @date 2025-07-02
*/
@Mapper
public interface AppOperationVideoMapper extends BaseMapperPlus<AppOperationVideo, AppOperationVideoVo> {
}

View File

@ -0,0 +1,83 @@
package com.fuyuanshen.equipment.service;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.mybatis.core.page.PageQuery;
import com.fuyuanshen.equipment.domain.AppBusinessFile;
import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
import com.fuyuanshen.equipment.domain.vo.AppBusinessFileVo;
import com.fuyuanshen.equipment.domain.vo.AppFileVo;
import java.util.Collection;
import java.util.List;
/**
* app业务文件Service接口
*
* @author Lion Li
* @date 2025-07-03
*/
public interface IAppBusinessFileService {
/**
* 查询app业务文件
*
* @param id 主键
* @return app业务文件
*/
AppBusinessFileVo queryById(Long id);
/**
* 分页查询app业务文件列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return app业务文件分页列表
*/
TableDataInfo<AppBusinessFileVo> queryPageList(AppBusinessFileBo bo, PageQuery pageQuery);
/**
* 查询符合条件的app业务文件列表
*
* @param bo 查询条件
* @return app业务文件列表
*/
List<AppBusinessFileVo> queryList(AppBusinessFileBo bo);
/**
* 新增app业务文件
*
* @param bo app业务文件
* @return 是否新增成功
*/
Boolean insertByBo(AppBusinessFileBo bo);
/**
* 批量新增app业务文件
*
* @param bo 批量新增app业务文件
* @return 是否新增成功
*/
Boolean insertBatch(Collection<AppBusinessFile> bo, Boolean isBatch);
void cloneFiles(Long sourceId, Long targetId);
/**
* 修改app业务文件
*
* @param bo app业务文件
* @return 是否修改成功
*/
Boolean updateByBo(AppBusinessFileBo bo);
/**
* 校验并批量删除app业务文件信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
List<AppFileVo> queryAppFileList(AppBusinessFileBo bo);
}

View File

@ -0,0 +1,79 @@
package com.fuyuanshen.equipment.service;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.mybatis.core.page.PageQuery;
import com.fuyuanshen.equipment.domain.AppOperationVideo;
import com.fuyuanshen.equipment.domain.bo.AppOperationVideoBo;
import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;
import java.util.Collection;
import java.util.List;
/**
* 操作视频Service接口
*
* @author Lion Li
* @date 2025-07-02
*/
public interface IAppOperationVideoService {
/**
* 查询操作视频
*
* @param id 主键
* @return 操作视频
*/
AppOperationVideoVo queryById(Long id);
/**
* 分页查询操作视频列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 操作视频分页列表
*/
TableDataInfo<AppOperationVideoVo> queryPageList(AppOperationVideoBo bo, PageQuery pageQuery);
/**
* 查询符合条件的操作视频列表
*
* @param bo 查询条件
* @return 操作视频列表
*/
List<AppOperationVideoVo> queryList(AppOperationVideoBo bo);
/**
* 新增操作视频
*
* @param bo 操作视频
* @return 是否新增成功
*/
Boolean insertByBo(AppOperationVideoBo bo);
/**
* 批量新增操作视频
*
* @param bo 批量新增操作视频
* @return 是否新增成功
*/
Boolean insertBatch(Collection<AppOperationVideo> bo);
void cloneFiles(Long sourceId, Long targetId);
/**
* 修改操作视频
*
* @param bo 操作视频
* @return 是否修改成功
*/
Boolean updateByBo(AppOperationVideoBo bo);
/**
* 校验并批量删除操作视频信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
}

View File

@ -0,0 +1,193 @@
package com.fuyuanshen.equipment.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fuyuanshen.common.core.utils.MapstructUtils;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fuyuanshen.equipment.domain.AppBusinessFile;
import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
import com.fuyuanshen.equipment.domain.vo.AppBusinessFileVo;
import com.fuyuanshen.equipment.domain.vo.AppFileVo;
import com.fuyuanshen.equipment.mapper.AppBusinessFileMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.fuyuanshen.equipment.service.IAppBusinessFileService;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.stream.Collectors;
/**
* app业务文件Service业务层处理
*
* @author Lion Li
* @date 2025-07-03
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class AppBusinessFileServiceImpl implements IAppBusinessFileService {
private final AppBusinessFileMapper baseMapper;
/**
* 查询app业务文件
*
* @param id 主键
* @return app业务文件
*/
@Override
public AppBusinessFileVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询app业务文件列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return app业务文件分页列表
*/
@Override
public TableDataInfo<AppBusinessFileVo> queryPageList(AppBusinessFileBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<AppBusinessFile> lqw = buildQueryWrapper(bo);
Page<AppBusinessFileVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的app业务文件列表
*
* @param bo 查询条件
* @return app业务文件列表
*/
@Override
public List<AppBusinessFileVo> queryList(AppBusinessFileBo bo) {
LambdaQueryWrapper<AppBusinessFile> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<AppBusinessFile> buildQueryWrapper(AppBusinessFileBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<AppBusinessFile> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(AppBusinessFile::getId);
lqw.eq(bo.getFileId()!=null, AppBusinessFile::getFileId, bo.getFileId());
lqw.eq(bo.getBusinessId() != null, AppBusinessFile::getBusinessId, bo.getBusinessId());
lqw.eq(bo.getFileType() != null, AppBusinessFile::getFileType, bo.getFileType());
lqw.in(bo.getIds()!=null, AppBusinessFile::getId, bo.getIds());
return lqw;
}
/**
* 新增app业务文件
*
* @param bo app业务文件
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(AppBusinessFileBo bo) {
AppBusinessFile add = MapstructUtils.convert(bo, AppBusinessFile.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
@Override
public Boolean insertBatch(Collection<AppBusinessFile> bo,Boolean isBatch) {
// 1. 去重后的 businessId 集合
if(isBatch){
List<Long> businessIds = bo.stream()
.map(AppBusinessFile::getBusinessId)
.distinct()
.toList();
QueryWrapper<AppBusinessFile> queryWrapper = new QueryWrapper<>();
queryWrapper.in("business_id", businessIds);
queryWrapper.eq("file_type", bo.stream().findFirst().orElseThrow().getFileType());
baseMapper.delete(queryWrapper);
}
return baseMapper.insertBatch(bo);
}
/**
* 克隆业务文件列表到新业务ID
* @param sourceId 源业务ID如设备类型ID
* @param targetId 目标业务ID如新设备ID
*/
@Transactional(rollbackFor = Exception.class)
@Override
public void cloneFiles(Long sourceId, Long targetId) {
// 1. 使用 Wrappers 替代 this.lambdaQuery()
List<AppBusinessFile> sourceFiles = baseMapper.selectList(
Wrappers.<AppBusinessFile>lambdaQuery().eq(AppBusinessFile::getBusinessId, sourceId)
);
if (CollUtil.isEmpty(sourceFiles)) {
return;
}
// 2. 批量转换并重置ID
List<AppBusinessFile> newFiles = sourceFiles.stream().map(file -> {
AppBusinessFile entity = new AppBusinessFile();
// 建议使用你代码中已有的 MapstructUtils 或 BeanUtil
BeanUtil.copyProperties(file, entity);
entity.setId(null); // 确保主键自增
entity.setBusinessId(targetId); // 绑定到新设备ID
return entity;
}).collect(Collectors.toList());
// 3. 使用你已有的 insertBatch 替代 saveBatch
// 注意:这里第二个参数传 false因为是新设备不需要执行你 insertBatch 里的删除逻辑
this.insertBatch(newFiles, false);
}
/**
* 修改app业务文件
*
* @param bo app业务文件
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(AppBusinessFileBo bo) {
AppBusinessFile update = MapstructUtils.convert(bo, AppBusinessFile.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(AppBusinessFile entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除app业务文件信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
@Override
public List<AppFileVo> queryAppFileList(AppBusinessFileBo bo) {
return baseMapper.queryAppFileList(bo);
}
}

View File

@ -0,0 +1,183 @@
package com.fuyuanshen.equipment.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fuyuanshen.common.core.utils.MapstructUtils;
import com.fuyuanshen.common.core.utils.StringUtils;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.fuyuanshen.equipment.domain.AppOperationVideo;
import com.fuyuanshen.equipment.domain.bo.AppOperationVideoBo;
import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;
import com.fuyuanshen.equipment.mapper.AppOperationVideoMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import com.fuyuanshen.equipment.service.IAppOperationVideoService;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.stream.Collectors;
/**
* 操作视频Service业务层处理
*
* @author Lion Li
* @date 2025-07-02
*/
@Slf4j
@RequiredArgsConstructor
@Service
public class AppOperationVideoServiceImpl implements IAppOperationVideoService {
private final AppOperationVideoMapper baseMapper;
/**
* 查询操作视频
*
* @param id 主键
* @return 操作视频
*/
@Override
public AppOperationVideoVo queryById(Long id){
return baseMapper.selectVoById(id);
}
/**
* 分页查询操作视频列表
*
* @param bo 查询条件
* @param pageQuery 分页参数
* @return 操作视频分页列表
*/
@Override
public TableDataInfo<AppOperationVideoVo> queryPageList(AppOperationVideoBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<AppOperationVideo> lqw = buildQueryWrapper(bo);
Page<AppOperationVideoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询符合条件的操作视频列表
*
* @param bo 查询条件
* @return 操作视频列表
*/
@Override
public List<AppOperationVideoVo> queryList(AppOperationVideoBo bo) {
LambdaQueryWrapper<AppOperationVideo> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<AppOperationVideo> buildQueryWrapper(AppOperationVideoBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<AppOperationVideo> lqw = Wrappers.lambdaQuery();
lqw.orderByAsc(AppOperationVideo::getId);
lqw.like(StringUtils.isNotBlank(bo.getVideoName()), AppOperationVideo::getVideoName, bo.getVideoName());
lqw.eq(StringUtils.isNotBlank(bo.getVideoUrl()), AppOperationVideo::getVideoUrl, bo.getVideoUrl());
lqw.eq(bo.getDeviceId() != null, AppOperationVideo::getDeviceId, bo.getDeviceId());
return lqw;
}
/**
* 新增操作视频
*
* @param bo 操作视频
* @return 是否新增成功
*/
@Override
public Boolean insertByBo(AppOperationVideoBo bo) {
AppOperationVideo add = MapstructUtils.convert(bo, AppOperationVideo.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
@Override
public Boolean insertBatch(Collection<AppOperationVideo> bo) {
// 1. 去重后的 businessId 集合
List<Long> deviceIds = bo.stream()
.map(AppOperationVideo::getDeviceId)
.distinct()
.toList();
QueryWrapper<AppOperationVideo> queryWrapper = new QueryWrapper<>();
queryWrapper.in("device_id", deviceIds);
baseMapper.delete(queryWrapper);
return baseMapper.insertBatch(bo);
}
/**
* 修改操作视频
*
* @param bo 操作视频
* @return 是否修改成功
*/
@Override
public Boolean updateByBo(AppOperationVideoBo bo) {
AppOperationVideo update = MapstructUtils.convert(bo, AppOperationVideo.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 克隆业务文件列表到新业务ID
* @param sourceId 源业务ID如设备类型ID
* @param targetId 目标业务ID如新设备ID
*/
@Transactional(rollbackFor = Exception.class)
@Override
public void cloneFiles(Long sourceId, Long targetId) {
// 1. 使用 Wrappers 替代 this.lambdaQuery()
List<AppOperationVideo> sourceFiles = baseMapper.selectList(
Wrappers.<AppOperationVideo>lambdaQuery().eq(AppOperationVideo::getDeviceId, sourceId)
);
if (CollUtil.isEmpty(sourceFiles)) {
return;
}
// 2. 批量转换并重置ID
List<AppOperationVideo> newFiles = sourceFiles.stream().map(file -> {
AppOperationVideo entity = new AppOperationVideo();
// 建议使用你代码中已有的 MapstructUtils 或 BeanUtil
BeanUtil.copyProperties(file, entity);
entity.setId(null); // 确保主键自增
entity.setDeviceId(targetId); // 绑定到新设备ID
return entity;
}).collect(Collectors.toList());
// 3. 使用你已有的 insertBatch 替代 saveBatch
this.insertBatch(newFiles);
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(AppOperationVideo entity){
//TODO 做一些数据校验,如唯一约束
}
/**
* 校验并批量删除操作视频信息
*
* @param ids 待删除的主键集合
* @param isValid 是否进行有效性校验
* @return 是否删除成功
*/
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
}
}

View File

@ -30,10 +30,7 @@ import com.fuyuanshen.equipment.enums.BindingStatusEnum;
import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
import com.fuyuanshen.equipment.enums.DeviceActiveStatusEnum;
import com.fuyuanshen.equipment.mapper.*;
import com.fuyuanshen.equipment.service.DeviceAssignmentsService;
import com.fuyuanshen.equipment.service.DeviceService;
import com.fuyuanshen.equipment.service.DeviceTypeGrantsService;
import com.fuyuanshen.equipment.service.IDeviceGeoFenceService;
import com.fuyuanshen.equipment.service.*;
import com.fuyuanshen.equipment.utils.FileHashUtil;
import com.fuyuanshen.system.domain.vo.SysOssVo;
import com.fuyuanshen.system.domain.vo.SysRoleVo;
@ -77,6 +74,8 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
private final DeviceFenceAccessRecordMapper deviceFenceAccessRecordMapper;
private final FileHashUtil fileHashUtil;
private final IAppBusinessFileService appBusinessFileService;
private final IAppOperationVideoService appOperationVideoService;
/**
@ -334,6 +333,12 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
device.setBindingStatus(0);
deviceMapper.insert(device);
// 查询设备类型的文件列表
// 4. 核心优化:同步设备类型的文件列表 (一行代码)
appBusinessFileService.cloneFiles(deviceType.getId(), device.getId());
//同步设备类型的视频列表
appOperationVideoService.cloneFiles(deviceType.getId(), device.getId());
// 新增设备类型记录
DeviceAssignments assignments = new DeviceAssignments();
assignments.setDeviceId(device.getId());

View File

@ -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.fuyuanshen.equipment.mapper.AppBusinessFileMapper">
<select id="queryAppFileList" resultType="com.fuyuanshen.equipment.domain.vo.AppFileVo">
select a.id,a.business_id,a.file_id,a.file_type,b.file_name,b.url fileUrl from app_business_file a left join sys_oss b on a.file_id = b.oss_id
where 1=1
<if test="businessId != null">
and a.business_id = #{businessId}
</if>
<if test="fileId != null">
and a.file_id = #{fileId}
</if>
<if test="fileType != null">
and a.file_type = #{fileType}
</if>
<if test="createBy != null">
and a.create_by = #{createBy}
</if>
order by a.create_time desc
</select>
</mapper>

View File

@ -0,0 +1,7 @@
<?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.fuyuanshen.equipment.mapper.AppOperationVideoMapper">
</mapper>