dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jingquan' into 6170

Browse Source 
# Conflicts:
#	fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppBusinessFileMapper.xml
This commit is contained in:
daiyongfei
2026-02-27 15:31:26 +08:00
parent 552bf0af0a 03f453f901
commit e036ef05ce
26 changed files with 185 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppBusinessFileController.java
View File

@ -17,9 +17,9 @@ import com.fuyuanshen.common.core.validate.AddGroup;
import com.fuyuanshen.common.core.validate.EditGroup;
import com.fuyuanshen.common.log.enums.BusinessType;
import com.fuyuanshen.common.excel.utils.ExcelUtil;
import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
import com.fuyuanshen.app.service.IAppBusinessFileService;
import com.fuyuanshen.equipment.domain.vo.AppBusinessFileVo;
import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
import com.fuyuanshen.equipment.service.IAppBusinessFileService;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
/**

6
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java
View File

@ -17,9 +17,9 @@ import com.fuyuanshen.common.core.validate.AddGroup;
import com.fuyuanshen.common.core.validate.EditGroup;
import com.fuyuanshen.common.log.enums.BusinessType;
import com.fuyuanshen.common.excel.utils.ExcelUtil;
import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
import com.fuyuanshen.app.service.IAppOperationVideoService;
import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;
import com.fuyuanshen.equipment.domain.bo.AppOperationVideoBo;
import com.fuyuanshen.equipment.service.IAppOperationVideoService;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
/**

3
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java
View File

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

2
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppBusinessFile.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/AppBusinessFile.java
View File

@ -1,4 +1,4 @@
package com.fuyuanshen.app.domain;
package com.fuyuanshen.equipment.domain;
import com.fuyuanshen.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;

2
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/AppOperationVideo.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/AppOperationVideo.java
View File

@ -1,4 +1,4 @@
package com.fuyuanshen.app.domain;
package com.fuyuanshen.equipment.domain;
import com.fuyuanshen.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;

4
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppBusinessFileBo.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/AppBusinessFileBo.java
View File

@ -1,6 +1,6 @@
package com.fuyuanshen.app.domain.bo;
package com.fuyuanshen.equipment.domain.bo;
import com.fuyuanshen.app.domain.AppBusinessFile;
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;

4
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppOperationVideoBo.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/AppOperationVideoBo.java
View File

@ -1,6 +1,6 @@
package com.fuyuanshen.app.domain.bo;
package com.fuyuanshen.equipment.domain.bo;
import com.fuyuanshen.app.domain.AppOperationVideo;
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;

8
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppBusinessFileVo.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppBusinessFileVo.java
View File

@ -1,17 +1,13 @@
package com.fuyuanshen.app.domain.vo;
package com.fuyuanshen.equipment.domain.vo;
import com.fuyuanshen.app.domain.AppBusinessFile;
import com.fuyuanshen.equipment.domain.AppBusinessFile;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

2
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppFileVo.java
View File

@ -1,4 +1,4 @@
package com.fuyuanshen.app.domain.vo;
package com.fuyuanshen.equipment.domain.vo;
import lombok.Data;

8
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppOperationVideoVo.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppOperationVideoVo.java
View File

@ -1,17 +1,13 @@
package com.fuyuanshen.app.domain.vo;
package com.fuyuanshen.equipment.domain.vo;
import com.fuyuanshen.app.domain.AppOperationVideo;
import com.fuyuanshen.equipment.domain.AppOperationVideo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
import java.util.Date;
/**

10
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppBusinessFileMapper.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/AppBusinessFileMapper.java
View File

@ -1,10 +1,10 @@
package com.fuyuanshen.app.mapper;
package com.fuyuanshen.equipment.mapper;
import com.fuyuanshen.app.domain.AppBusinessFile;
import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
import com.fuyuanshen.app.domain.vo.AppFileVo;
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;

6
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppOperationVideoMapper.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/AppOperationVideoMapper.java
View File

@ -1,8 +1,8 @@
package com.fuyuanshen.app.mapper;
package com.fuyuanshen.equipment.mapper;
import com.fuyuanshen.app.domain.AppOperationVideo;
import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
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;
/**

14
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppBusinessFileService.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IAppBusinessFileService.java
View File

@ -1,11 +1,11 @@
package com.fuyuanshen.app.service;
package com.fuyuanshen.equipment.service;
import com.fuyuanshen.app.domain.AppBusinessFile;
import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
import com.fuyuanshen.app.domain.vo.AppFileVo;
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;
@ -57,7 +57,9 @@ public interface IAppBusinessFileService {
* @param bo 批量新增app业务文件
* @return 是否新增成功
*/
Boolean insertBatch(Collection<AppBusinessFile> bo,Boolean isBatch);
Boolean insertBatch(Collection<AppBusinessFile> bo, Boolean isBatch);
void cloneFiles(Long sourceId, Long targetId);
/**
* 修改app业务文件

11
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppOperationVideoService.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IAppOperationVideoService.java
View File

@ -1,11 +1,10 @@
package com.fuyuanshen.app.service;
package com.fuyuanshen.equipment.service;
import com.fuyuanshen.app.domain.AppBusinessFile;
import com.fuyuanshen.app.domain.AppOperationVideo;
import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
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;
@ -59,6 +58,8 @@ public interface IAppOperationVideoService {
*/
Boolean insertBatch(Collection<AppOperationVideo> bo);
void cloneFiles(Long sourceId, Long targetId);
/**
* 修改操作视频
*

52
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppBusinessFileServiceImpl.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/AppBusinessFileServiceImpl.java
View File

@ -1,27 +1,29 @@
package com.fuyuanshen.app.service.impl;
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.app.domain.vo.AppFileVo;
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.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.app.domain.bo.AppBusinessFileBo;
import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
import com.fuyuanshen.app.domain.AppBusinessFile;
import com.fuyuanshen.app.mapper.AppBusinessFileMapper;
import com.fuyuanshen.app.service.IAppBusinessFileService;
import com.fuyuanshen.equipment.service.IAppBusinessFileService;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.stream.Collectors;
/**
* app业务文件Service业务层处理
@ -117,6 +119,38 @@ public class AppBusinessFileServiceImpl implements IAppBusinessFileService {
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业务文件
*

48
fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppOperationVideoServiceImpl.java → fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/AppOperationVideoServiceImpl.java
View File

@ -1,7 +1,8 @@
package com.fuyuanshen.app.service.impl;
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.app.domain.AppBusinessFile;
import com.fuyuanshen.common.core.utils.MapstructUtils;
import com.fuyuanshen.common.core.utils.StringUtils;
import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
@ -9,18 +10,20 @@ 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.app.domain.bo.AppOperationVideoBo;
import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
import com.fuyuanshen.app.domain.AppOperationVideo;
import com.fuyuanshen.app.mapper.AppOperationVideoMapper;
import com.fuyuanshen.app.service.IAppOperationVideoService;
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业务层处理
@ -125,6 +128,37 @@ public class AppOperationVideoServiceImpl implements IAppOperationVideoService {
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);
}
/**
* 保存前的数据校验
*/

13
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
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());

2
fys-modules/fys-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml → fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppBusinessFileMapper.xml
View File

@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuyuanshen.app.mapper.AppBusinessFileMapper">
<select id="queryAppFileList" resultType="com.fuyuanshen.app.domain.vo.AppFileVo">
<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,a.duration,
CASE
WHEN a.re_name IS NULL THEN

2
fys-modules/fys-app/src/main/resources/mapper/app/AppOperationVideoMapper.xml → fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppOperationVideoMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.fuyuanshen.app.mapper.AppOperationVideoMapper">
<mapper namespace="com.fuyuanshen.equipment.mapper.AppOperationVideoMapper">
</mapper>