Merge pull request 'refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块' (#25 ) from liwenlong/fys-Multi-tenant:jingquan into jingquan

Reviewed-on: #25
refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块
2026-02-27 15:29:26 +08:00 · 2026-02-27 15:13:53 +08:00 · 2026-01-30 16:06:57 +08:00 · 2026-01-30 16:03:13 +08:00 · 2026-01-28 16:33:25 +08:00 · 2026-01-19 16:39:01 +08:00
41 changed files with 465 additions and 138 deletions
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppFileController.java
@ -1,8 +1,8 @@
 package com.fuyuanshen.app.controller;

-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
 import com.fuyuanshen.app.domain.dto.AppFileDto;
-import com.fuyuanshen.app.domain.vo.AppFileVo;
+import com.fuyuanshen.equipment.domain.vo.AppFileVo;
 import com.fuyuanshen.app.service.AppFileService;
 import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.web.core.BaseController;
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java
@ -1,8 +1,8 @@
 package com.fuyuanshen.app.controller;

-import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
-import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
-import com.fuyuanshen.app.service.IAppOperationVideoService;
+import com.fuyuanshen.equipment.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.equipment.service.IAppOperationVideoService;
 import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.core.domain.model.AppLoginUser;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
--- a/fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceXinghanController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceXinghanController.java
@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

 import java.util.List;
+import java.util.Map;

 /**
 * HBY670设备控制类
@ -133,7 +134,7 @@ public class AppDeviceXinghanController extends BaseController {
    }

    // @Log("新增设备")
-    @Operation(summary = "新增设备")
+    @Log(title = "新增设备")
    @PostMapping(value = "/add")
    public R<Void> addDevice(@RequestBody DeviceForm deviceForm) {
        try {
@ -144,4 +145,26 @@ public class AppDeviceXinghanController extends BaseController {
        return R.ok();
    }

+    @PostMapping(value = "/GetDeviceByName")
+    @Operation(summary = "通过蓝牙名/设备名称查询设备")
+    public R<Object> GetDeviceByName(@RequestBody DeviceForm deviceForm) {
+        Object device = appDeviceService.GetDeviceByName(deviceForm);
+        return R.ok(device);
+    }
+
+
+    @PostMapping(value = "/getEquipCountByType")
+    @Operation(summary = "查询某个类型下的设备总数量")
+    public R<Object> getEquipCountByType(@RequestBody DeviceForm deviceForm) {
+        Object device = appDeviceService.getEquipCountByType(deviceForm);
+        return R.ok(device);
+    }
+
+    @PostMapping(value = "/getEquipAllByType")
+    @Operation(summary = "查询某个类型下的设备")
+    public R<List<Map<String,Object>>> getEquipAllByType(@RequestBody DeviceForm deviceForm){
+        List<Map<String,Object>> list=appDeviceService.getEquipAllByType(deviceForm);
+        return R.ok(list);
+    }
+
 }
--- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java
@ -227,7 +227,7 @@ public class AppDeviceShareService {
            appDeviceShare.setPermission(bo.getPermission());
            appDeviceShare.setCreateBy(userId);
            return appDeviceShareMapper.insert(appDeviceShare);
-        }
+}
    }

    public int remove(Long[] ids) {
--- a/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/app/service/AppFileService.java
@ -1,13 +1,14 @@
 package com.fuyuanshen.app.service;

-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
 import com.fuyuanshen.app.domain.dto.AppFileDto;
-import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
-import com.fuyuanshen.app.domain.vo.AppFileVo;
+import com.fuyuanshen.equipment.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.equipment.domain.vo.AppFileVo;
 import com.fuyuanshen.common.core.exception.ServiceException;
 import com.fuyuanshen.common.oss.core.OssClient;
 import com.fuyuanshen.common.oss.factory.OssFactory;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.equipment.service.IAppBusinessFileService;
 import com.fuyuanshen.equipment.utils.FileHashUtil;
 import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.service.ISysOssService;
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceDebugController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceDebugController.java
@ -1,19 +1,15 @@
 package com.fuyuanshen.web.controller.device;

-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
-import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.equipment.domain.bo.AppOperationVideoBo;
 import com.fuyuanshen.app.domain.dto.AppFileDto;
 import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.core.exception.ServiceException;
 import com.fuyuanshen.common.log.annotation.Log;
-import com.fuyuanshen.common.log.enums.BusinessType;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
 import com.fuyuanshen.common.web.core.BaseController;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
-import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
 import com.fuyuanshen.equipment.domain.vo.WebDeviceVo;
 import com.fuyuanshen.web.domain.Dto.DeviceDebugEditDto;
 import com.fuyuanshen.web.domain.Dto.DeviceDebugLogoUploadDto;
@ -28,8 +24,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;

 /**
 * 联调中心
@ -125,7 +119,7 @@ public class DeviceDebugController extends BaseController {
        }
        deviceDebugService.delFile(bo.getFileIds());
        // 修改操作视频
-        if (bo.getVideoUrl().isEmpty()) {
+        if (!bo.getVideoUrl().isEmpty()) {
            AppOperationVideoBo appOperationVideoBo = new AppOperationVideoBo();
            appOperationVideoBo.setDeviceIds(new Long[]{ bo.getDeviceId() });
            appOperationVideoBo.setVideoUrl(bo.getVideoUrl());
--- a/fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/DeviceInfoVo.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/DeviceInfoVo.java
@ -1,10 +1,7 @@
 package com.fuyuanshen.web.domain.vo;

-import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
-import com.fuyuanshen.app.domain.vo.AppFileVo;
-import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
-import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.domain.vo.AppFileVo;
+import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;
 import lombok.Data;

 import java.util.List;
--- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceDebugService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceDebugService.java
@ -1,13 +1,13 @@
 package com.fuyuanshen.web.service.device;

 import cn.hutool.core.collection.CollUtil;
-import com.fuyuanshen.app.domain.AppBusinessFile;
-import com.fuyuanshen.app.domain.AppOperationVideo;
-import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
-import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.equipment.domain.AppBusinessFile;
+import com.fuyuanshen.equipment.domain.AppOperationVideo;
+import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.equipment.domain.bo.AppOperationVideoBo;
 import com.fuyuanshen.app.domain.dto.AppFileDto;
-import com.fuyuanshen.app.service.IAppBusinessFileService;
-import com.fuyuanshen.app.service.IAppOperationVideoService;
+import com.fuyuanshen.equipment.service.IAppBusinessFileService;
+import com.fuyuanshen.equipment.service.IAppOperationVideoService;
 import com.fuyuanshen.common.core.exception.ServiceException;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
 import com.fuyuanshen.equipment.service.DeviceService;
--- a/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java
@ -1,11 +1,11 @@
 package com.fuyuanshen.web.service.device;

 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@ -15,20 +15,17 @@ import com.fuyuanshen.app.domain.AppPersonnelInfo;
 import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
 import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
 import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
-import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
-import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
 import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
 import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
 import com.fuyuanshen.app.mapper.AppPersonnelInfoRecordsMapper;
+import com.fuyuanshen.equipment.service.IAppBusinessFileService;
+import com.fuyuanshen.equipment.service.IAppOperationVideoService;
 import com.fuyuanshen.common.core.constant.GlobalConstants;
-import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.core.domain.model.AppLoginUser;
-import com.fuyuanshen.common.core.domain.model.LoginUser;
 import com.fuyuanshen.common.core.exception.BadRequestException;
 import com.fuyuanshen.common.core.exception.ServiceException;
 import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
 import com.fuyuanshen.common.core.utils.MapstructUtils;
-import com.fuyuanshen.common.core.utils.ObjectUtils;
 import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
@ -40,7 +37,6 @@ import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
 import com.fuyuanshen.equipment.domain.form.DeviceForm;
 import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;
 import com.fuyuanshen.equipment.enums.DeviceActiveStatusEnum;
-import com.fuyuanshen.equipment.enums.LightModeEnum;
 import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeGrantsMapper;
@ -51,26 +47,23 @@ import com.fuyuanshen.global.mqtt.base.MqttXinghanJson;
 import com.fuyuanshen.global.mqtt.config.MqttGateway;
 import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.global.mqtt.constants.MqttConstants;
-import com.fuyuanshen.system.domain.vo.SysOssVo;
-import com.fuyuanshen.system.domain.vo.SysRoleVo;
 import com.fuyuanshen.web.domain.Dto.DeviceDebugLogoUploadDto;
 import com.fuyuanshen.web.domain.Dto.DeviceXinghanInstructDto;
 import com.fuyuanshen.web.domain.vo.DeviceXinghanDetailVo;
 import com.fuyuanshen.web.enums.AlarmTypeEnum;
+import com.fuyuanshen.web.util.AliyunVoiceUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.multipart.MultipartFile;

 import java.io.IOException;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.stream.Collectors;

 import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
 import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
@ -91,8 +84,11 @@ public class DeviceXinghanBizService {
    private final IDeviceAlarmService deviceAlarmService;
    private final DeviceTypeGrantsMapper deviceTypeGrantsMapper;
    private final DeviceAssignmentsService deviceAssignmentsService;
+    private final IAppBusinessFileService appBusinessFileService;
+    private final IAppOperationVideoService appOperationVideoService;
    @Autowired
    private ObjectMapper objectMapper;
+    private final AliyunVoiceUtil voiceUtil;

    /**
     * 所有档位的描述表
@ -135,7 +131,6 @@ public class DeviceXinghanBizService {
    public void upSOSGradeSettings(DeviceXinghanInstructDto dto) {
        if(dto.getIsBluetooth()){
            long deviceId = dto.getDeviceId();
-
            // 1. 使用Optional简化空值检查，使代码更简洁
            Device device = Optional.ofNullable(deviceMapper.selectById(deviceId))
                    .orElseThrow(() -> new ServiceException("设备不存在"));
@ -147,6 +142,24 @@ public class DeviceXinghanBizService {
        }
    }

+    /**
+     * 触发异步报警
+     * Spring 会自动调用 AsyncConfig.getAsyncExecutor() 来执行此方法
+     */
+    @Async
+    public void executeSosCall(String phone) {
+        log.info("[SOS业务] 准备发起语音拨号 -> 目标: {}", phone);
+        Map<String, String> params = Map.of("device", "670");
+        String callId = voiceUtil.sendTtsSync(phone, "TTS_328730104", params);
+
+        if (callId != null) {
+            log.info("[SOS业务] 拨号指令下发成功, callId: {}", callId);
+            // 这里可以记录拨打日志到数据库
+        } else {
+            log.error("[SOS业务] 拨号指令下发失败，请检查配置或余额");
+        }
+    }
+
    /**
     * 设置强制报警
     */
@ -701,20 +714,31 @@ public class DeviceXinghanBizService {
        return deviceTypeMapper.findAll(criteria);
    }

-    // @Log("新增设备")
-    public void addDevice(DeviceForm deviceForm) {
-        if (deviceForm.getDeviceMac() != null && deviceForm.getBluetoothName() == null) {
+    /**
+     * 校验唯一性约束
+     */
+    private void validateDeviceUnique(DeviceForm form) {
+        if (form.getDeviceMac() != null && form.getBluetoothName() == null) {
            throw new BadRequestException("请填写蓝牙名称！！！");
        }

-        Device device1 = deviceMapper.selectOne(new QueryWrapper<Device>().eq("device_mac", deviceForm.getDeviceMac()));
-        if (device1 != null) {
+        // 使用 QueryWrapper 替代 lambdaQuery()
+        Long macCount = deviceMapper.selectCount(new LambdaQueryWrapper<Device>()
+                .eq(Device::getDeviceMac, form.getDeviceMac()));
+        if (macCount > 0) {
            throw new BadRequestException("设备MAC已存在！！！");
        }
-        Device device2 = deviceMapper.selectOne(new QueryWrapper<Device>().eq("device_imei", deviceForm.getDeviceImei()));
-        if (device2 != null) {
+
+        Long imeiCount = deviceMapper.selectCount(new LambdaQueryWrapper<Device>()
+                .eq(Device::getDeviceImei, form.getDeviceImei()));
+        if (imeiCount > 0) {
            throw new BadRequestException("设备IMEI已存在！！！");
        }
+    }
+
+    // @Log("新增设备")
+    public void addDevice(DeviceForm deviceForm) {
+        validateDeviceUnique(deviceForm);

        DeviceTypeQueryCriteria queryCriteria = new DeviceTypeQueryCriteria();
        queryCriteria.setDeviceTypeId(deviceForm.getDeviceType());
@ -739,6 +763,7 @@ public class DeviceXinghanBizService {
        device.setCreateByName(loginUser.getNickname());
        device.setTypeName(deviceTypes.getTypeName());
        device.setDeviceType(deviceTypes.getId());
+        device.setDevicePic(deviceTypes.getDevicePic());
        if (device.getDeviceImei() != null) {
            device.setPubTopic("A/" + device.getDeviceImei());
            device.setSubTopic("B/" + device.getDeviceImei());
@ -747,6 +772,14 @@ public class DeviceXinghanBizService {
        device.setBindingStatus(0);
        deviceMapper.insert(device);

+        Long deviceId = device.getDeviceId();
+
+        // 查询设备类型的文件列表
+        // 4. 核心优化：同步设备类型的文件列表 (一行代码)
+        appBusinessFileService.cloneFiles(deviceTypes.getId(), device.getId());
+        //同步设备类型的视频列表
+        appOperationVideoService.cloneFiles(deviceTypes.getId(), device.getId());
+
        // 新增设备类型记录
        DeviceAssignments assignments = new DeviceAssignments();
        assignments.setDeviceId(device.getId());
@ -767,4 +800,23 @@ public class DeviceXinghanBizService {
        return uuidStr.replaceAll("-", "");
    }

+    public Map<String, Object> GetDeviceByName(DeviceForm deviceForm){
+        List<Map<String, Object>> list= deviceMapper.GetDeviceByName(deviceForm);
+        Map<String, Object> device=null;
+        if(list!=null && list.size()>0){
+            device=list.get(0);
+        }
+        return device;
+    }
+
+    public int getEquipCountByType(DeviceForm form){
+        var res=deviceMapper.getEquipCountByType(form);
+        return res;
+    }
+
+    public List<Map<String,Object>> getEquipAllByType(DeviceForm deviceForm){
+        List<Map<String, Object>> list= deviceMapper.getEquipAllByType(deviceForm);
+        return list;
+    }
+
 }
--- a/fys-admin/src/main/java/com/fuyuanshen/web/util/AliyunVoiceUtil.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/util/AliyunVoiceUtil.java
@ -0,0 +1,87 @@
+package com.fuyuanshen.web.util;
+
+import com.aliyun.dyvmsapi20170525.Client;
+import com.aliyun.dyvmsapi20170525.models.SingleCallByTtsRequest;
+import com.aliyun.dyvmsapi20170525.models.SingleCallByTtsResponse;
+import com.aliyun.teaopenapi.models.Config;
+import com.aliyun.teautil.models.RuntimeOptions;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import java.util.Map;
+
+@Slf4j
+@Component
+public class AliyunVoiceUtil {
+
+    private static final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Value("${alibaba.tts.akId}")
+    private String akId;
+    @Value("${alibaba.tts.akSecret}")
+    private String akSecret;
+//    @Value("${alibaba.tts.calledShowNumber:}")
+    private String calledShowNumber;
+
+    // ========== 核心：单例客户端（类似 OkHttpClient） ==========
+    private volatile Client client;
+
+    /**
+     * 获取客户端（双重检查锁实现单例）
+     * 只有在第一次调用时才会根据配置实例化，后续直接返回复用
+     */
+    private Client getClient() throws Exception {
+        if (client == null) {
+            synchronized (this) {
+                if (client == null) {
+                    log.info("[AliyunVoice] 正在初始化阿里云语音客户端...");
+                    Config config = new Config()
+                            .setAccessKeyId(akId)
+                            .setAccessKeySecret(akSecret)
+                            .setEndpoint("dyvmsapi.aliyuncs.com");
+                    this.client = new Client(config);
+                }
+            }
+        }
+        return client;
+    }
+
+    /**
+     * 同步发送方法：由异步架构调用
+     */
+    public String sendTtsSync(String phone, String templateCode, Map<String, String> params) {
+
+        try {
+            // 1. 获取（或初始化）单例客户端
+            Client voiceClient = getClient();
+
+            SingleCallByTtsRequest request = new SingleCallByTtsRequest()
+                    .setCalledNumber(phone)
+                    .setTtsCode(templateCode)
+                    .setTtsParam(objectMapper.writeValueAsString(params));
+
+            if (StringUtils.hasText(calledShowNumber)) {
+                request.setCalledShowNumber(calledShowNumber);
+            }
+
+            // 生产级超时配置
+            RuntimeOptions runtime = new RuntimeOptions();
+            runtime.setConnectTimeout(5000);
+            runtime.setReadTimeout(10000);
+
+            SingleCallByTtsResponse response = voiceClient.singleCallByTtsWithOptions(request, runtime);
+
+            if ("OK".equalsIgnoreCase(response.getBody().getCode())) {
+                return response.getBody().getCallId();
+            } else {
+                log.error("[AliyunVoice] 拨号失败: {}", response.getBody().getMessage());
+            }
+        } catch (Exception e) {
+            log.error("[AliyunVoice] 接口异常", e);
+        }
+        return null;
+    }
+}
--- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppBusinessFileController.java
+++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppBusinessFileController.java
@ -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;

 /**
--- a/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java
+++ b/fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppOperationVideoController.java
@ -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;

 /**
--- a/fys-modules/fys-equipment/pom.xml
+++ b/fys-modules/fys-equipment/pom.xml
@ -140,6 +140,18 @@
            <version>3.3.1</version>
        </dependency>

+        <!-- 电话语音通知 -->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dyvmsapi20170525</artifactId>
+            <version>4.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>tea-openapi</artifactId>
+            <version>0.3.2</version>
+        </dependency>
+
        <!-- fastjson2 -->
        <dependency>
            <groupId>com.alibaba.fastjson2</groupId>
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java
@ -317,8 +317,7 @@ public class DeviceController extends BaseController {
            // 定义必需的表头
            Set<String> requiredHeaders = new HashSet<>(Arrays.asList(
                    "设备名称", "设备类型名称", "设备图片", "设备MAC", "蓝牙名称", "设备IMEI",
-                    "备注", "是否支持蓝牙", "定位方式", "通讯方式",
-                    "型号字典用于APP页面跳转", "型号字典用于PC页面跳转"
+                    "备注"
            ));

            // 检查必需的表头是否都存在
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceTypeController.java
@ -15,6 +15,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

+import java.io.IOException;
 import java.util.List;

 /**
@ -50,7 +51,7 @@ public class DeviceTypeController {
    // @Log("新增设备类型")
    @Operation(summary = "新增设备类型")
    @PostMapping(value = "/add")
-    public R<Void> createDeviceType(@Validated @RequestBody DeviceType resources) {
+    public R<Void> createDeviceType(@Validated @ModelAttribute DeviceTypeForm resources) throws IOException {
        deviceTypeService.create(resources);
        return R.ok();
    }
@ -59,7 +60,7 @@ public class DeviceTypeController {
    // @Log("修改设备类型")
    @Operation(summary = "修改设备类型")
    @PutMapping(value = "/update")
-    public  R<Void>  updateDeviceType(@Validated @RequestBody DeviceTypeForm resources) {
+    public  R<Void>  updateDeviceType(@Validated @ModelAttribute DeviceTypeForm resources) throws IOException {
        deviceTypeService.update(resources);
        return R.ok();
    }
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/TrackServiceController.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/TrackServiceController.java
@ -44,7 +44,7 @@ public class TrackServiceController extends BaseController {
    /**
     * 查询轨迹服务列表
     */
-    @SaCheckPermission("equipment:trackService:list")
+//    @SaCheckPermission("equipment:trackService:list")
    @GetMapping("/list")
    public TableDataInfo<TrackServiceVo> list(TrackServiceBo bo, PageQuery pageQuery) {
        return trackServiceService.queryPageList(bo, pageQuery);
@ -53,7 +53,7 @@ public class TrackServiceController extends BaseController {
    /**
     * 轨迹服务列表
     */
-    @SaCheckPermission("equipment:trackService:export")
+//    @SaCheckPermission("equipment:trackService:export")
    @Log(title = "轨迹服务", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(TrackServiceBo bo, HttpServletResponse response) {
@ -75,7 +75,7 @@ public class TrackServiceController extends BaseController {
    /**
     * 新增轨迹服务
     */
-    @SaCheckPermission("equipment:trackService:add")
+//    @SaCheckPermission("equipment:trackService:add")
    @Log(title = "轨迹服务", businessType = BusinessType.INSERT)
    @PostMapping(value = "/add")
    public R<Void> add(@Validated(AddGroup.class) @RequestBody TrackServiceBo bo) {
@ -85,7 +85,7 @@ public class TrackServiceController extends BaseController {
    /**
     * 修改轨迹服务
     */
-    @SaCheckPermission("equipment:trackService:edit")
+//    @SaCheckPermission("equipment:trackService:edit")
    @Log(title = "轨迹服务", businessType = BusinessType.UPDATE)
    @PostMapping(value = "/update")
    public R<Void> edit(@Validated(EditGroup.class) @RequestBody TrackServiceBo bo) {
@ -97,7 +97,7 @@ public class TrackServiceController extends BaseController {
     *
     * @param ids 主键串
     */
-    @SaCheckPermission("equipment:trackService:remove")
+//    @SaCheckPermission("equipment:trackService:remove")
    @Log(title = "轨迹服务", businessType = BusinessType.DELETE)
    @DeleteMapping(value = "/delete")
    public R<Void> remove(@NotEmpty(message = "主键不能为空")
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/AppBusinessFile.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/AppBusinessFile.java
@ -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.*;
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/AppOperationVideo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/AppOperationVideo.java
@ -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.*;
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java
@ -85,5 +85,8 @@ public class DeviceType extends TenantEntity {
    @Schema(title = "型号字典用于PC页面跳转")
    private String pcModelDictionary;

+    @Schema(title = "设备图片")
+    private String devicePic;
+

 }
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/AppBusinessFileBo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/AppBusinessFileBo.java
@ -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;
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/AppOperationVideoBo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/AppOperationVideoBo.java
@ -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;
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java
@ -54,6 +54,9 @@ public class DeviceForm {
    @Schema(title = "备注")
    private String remark;

+    @Schema(title = "商户号")
+    private Long tenant_id;
+

    // 设备类型相关字段
    @Schema(title = "设备类型名称")
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java
@ -2,6 +2,7 @@ package com.fuyuanshen.equipment.domain.form;

 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;

 /**
 * @Description: 设备类型
@ -48,5 +49,10 @@ public class DeviceTypeForm {
     */
    @Schema(title = "型号字典用于PC页面跳转")
    private String pcModelDictionary;
+    @Schema(title = "设备图片")
+    private String devicePic;
+
+    @Schema(title = "设备图片")
+    private MultipartFile file;

 }
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppBusinessFileVo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppBusinessFileVo.java
@ -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;
-


 /**
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppFileVo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppFileVo.java
@ -1,4 +1,4 @@
-package com.fuyuanshen.app.domain.vo;
+package com.fuyuanshen.equipment.domain.vo;

 import lombok.Data;

--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppOperationVideoVo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppOperationVideoVo.java
@ -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;
-


 /**
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/excel/UploadDeviceDataListener.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/excel/UploadDeviceDataListener.java
@ -12,6 +12,7 @@ import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.domain.dto.DeviceExcelImportDTO;
 import com.fuyuanshen.equipment.domain.dto.ImportResult;
 import com.fuyuanshen.equipment.domain.form.DeviceForm;
+import com.fuyuanshen.equipment.domain.form.DeviceTypeForm;
 import com.fuyuanshen.equipment.handler.ImageWriteHandler;
 import com.fuyuanshen.system.domain.vo.SysOssVo;
 import lombok.extern.slf4j.Slf4j;
@ -437,8 +438,10 @@ public class UploadDeviceDataListener implements ReadListener<DeviceExcelImportD
                    newDeviceType.setAppModelDictionary(originalDto.getAppModelDictionary());
                    newDeviceType.setPcModelDictionary(originalDto.getPcModelDictionary());

+                    DeviceTypeForm deviceTypeForm = new DeviceTypeForm();
+                    BeanUtil.copyProperties(newDeviceType, deviceTypeForm, true);
                    // 创建新的设备类型
-                    params.getDeviceTypeService().create(newDeviceType);
+                    params.getDeviceTypeService().create(deviceTypeForm);

                    // 重新查询确保获取到正确的ID
                    deviceType = params.getDeviceTypeService().queryByName(device.getTypeName());
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/AppBusinessFileMapper.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/AppBusinessFileMapper.java
@ -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;

--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/AppOperationVideoMapper.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/AppOperationVideoMapper.java
@ -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;

 /**
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java
@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.dto.InstructionRecordDto;
+import com.fuyuanshen.equipment.domain.form.DeviceForm;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
 import com.fuyuanshen.equipment.domain.vo.*;
 import org.apache.ibatis.annotations.Mapper;
@ -148,4 +149,10 @@ public interface DeviceMapper extends BaseMapper<Device> {
     */
    int countByDeviceTypeId(@Param("deviceTypeId") Long deviceTypeId);

+    List<Map<String, Object>> GetDeviceByName(DeviceForm deviceForm);
+
+    int getEquipCountByType(DeviceForm deviceForm);
+
+    List<Map<String,Object>> getEquipAllByType(DeviceForm deviceForm);
+
 }
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceTypeService.java
@ -8,6 +8,7 @@ import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.domain.form.DeviceTypeForm;
 import com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;

+import java.io.IOException;
 import java.util.List;

 /**
@ -63,14 +64,14 @@ public interface DeviceTypeService extends IService<DeviceType> {
     *
     * @param resources /
     */
-    void create(DeviceType resources);
+    void create(DeviceTypeForm resources) throws IOException;

    /**
     * 修改设备类型
     *
     * @param resources /
     */
-    void update(DeviceTypeForm resources);
+    void update(DeviceTypeForm resources) throws IOException;

    /**
     * 多选删除
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IAppBusinessFileService.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IAppBusinessFileService.java
@ -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业务文件
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IAppOperationVideoService.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IAppOperationVideoService.java
@ -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);
+
    /**
     * 修改操作视频
     *
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/AppBusinessFileServiceImpl.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/AppBusinessFileServiceImpl.java
@ -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业务文件
     *
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/AppOperationVideoServiceImpl.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/AppOperationVideoServiceImpl.java
@ -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);
+    }
+
    /**
     * 保存前的数据校验
     */
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java
@ -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;


    /**
@ -325,6 +324,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
        device.setCreateByName(loginUser.getNickname());
        device.setTypeName(deviceType.getTypeName());
        device.setDeviceType(deviceType.getId());
+        device.setDevicePic(deviceType.getDevicePic());
        if (device.getDeviceImei() != null) {
            device.setPubTopic("A/" + device.getDeviceImei());
            device.setSubTopic("B/" + device.getDeviceImei());
@ -333,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());
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceTypeServiceImpl.java
@ -19,12 +19,16 @@ import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeGrantsMapper;
 import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
 import com.fuyuanshen.equipment.service.DeviceTypeService;
+import com.fuyuanshen.equipment.utils.FileHashUtil;
+import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.domain.vo.SysRoleVo;
+import com.fuyuanshen.system.service.ISysOssService;
 import com.fuyuanshen.system.service.ISysRoleService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@ -46,6 +50,8 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
    private final DeviceAssignmentsMapper deviceAssignmentsMapper;

    private final ISysRoleService roleService;
+    private final ISysOssService ossService;
+    private final FileHashUtil fileHashUtil;


    /**
@ -181,24 +187,38 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
-    public void create(DeviceType resources) {
+    public void create(DeviceTypeForm resources) throws IOException {

        // 校验设备类型名称
        List<DeviceType> typeName = deviceTypeMapper.selectList(new QueryWrapper<DeviceType>().eq("type_name", resources.getTypeName()));
        if (CollectionUtil.isNotEmpty(typeName)) {
            throw new RuntimeException("设备类型名称已存在，无法新增!!!");
        }
+        // 保存图片并获取URL
+        if (resources.getFile() != null) {
+            String fileHash = fileHashUtil.hash(resources.getFile());
+            SysOssVo upload = ossService.updateHash(resources.getFile(), fileHash);
+            // 强制将HTTP替换为HTTPS
+            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
+                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
+            }
+            // 设置图片路径
+            resources.setDevicePic(upload.getUrl());
+        }
+
+        DeviceType deviceType = new DeviceType();
+        BeanUtil.copyProperties(resources, deviceType, true);

        LoginUser loginUser = LoginHelper.getLoginUser();
-        resources.setCustomerId(loginUser.getUserId());
-        resources.setOwnerCustomerId(loginUser.getUserId());
-        resources.setOriginalOwnerId(loginUser.getUserId());
-        resources.setCreateByName(loginUser.getNickname());
-        deviceTypeMapper.insert(resources);
+        deviceType.setCustomerId(loginUser.getUserId());
+        deviceType.setOwnerCustomerId(loginUser.getUserId());
+        deviceType.setOriginalOwnerId(loginUser.getUserId());
+        deviceType.setCreateByName(loginUser.getNickname());
+        deviceTypeMapper.insert(deviceType);

        // 自动授权给自己
        DeviceTypeGrants deviceTypeGrants = new DeviceTypeGrants();
-        deviceTypeGrants.setDeviceTypeId(resources.getId());
+        deviceTypeGrants.setDeviceTypeId(deviceType.getId());
        deviceTypeGrants.setCustomerId(loginUser.getUserId());
        deviceTypeGrants.setGrantorCustomerId(loginUser.getUserId());
        deviceTypeGrants.setGrantedAt(new Date());
@ -213,7 +233,7 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
-    public void update(DeviceTypeForm resources) {
+    public void update(DeviceTypeForm resources) throws IOException {
        DeviceTypeGrants deviceTypeGrants = deviceTypeGrantsMapper.selectById(resources.getId());
        if (deviceTypeGrants == null) {
            throw new RuntimeException("设备类型不存在");
@ -244,6 +264,17 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
                throw new RuntimeException("无权修改该设备类型");
            }
        }
+        // 保存图片并获取URL
+        if (resources.getFile() != null) {
+            String fileHash = fileHashUtil.hash(resources.getFile());
+            SysOssVo upload = ossService.updateHash(resources.getFile(), fileHash);
+            // 强制将HTTP替换为HTTPS
+            if (upload.getUrl() != null && upload.getUrl().startsWith("http://")) {
+                upload.setUrl(upload.getUrl().replaceFirst("^http://", "https://"));
+            }
+            // 设置图片路径
+            resources.setDevicePic(upload.getUrl());
+        }

        BeanUtil.copyProperties(resources, deviceType);
        deviceTypeMapper.updateById(deviceType);
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppBusinessFileMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppBusinessFileMapper.xml
@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.fuyuanshen.app.mapper.AppBusinessFileMapper">
+<mapper namespace="com.fuyuanshen.equipment.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 from app_business_file a left join sys_oss b on a.file_id = b.oss_id
        where 1=1
        <if test="businessId != null">
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppOperationVideoMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/AppOperationVideoMapper.xml
@ -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>
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceLogMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceLogMapper.xml
@ -13,8 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        a.content,
        a.create_time AS createTime
        FROM
-        device_log a left join device b on a.device_id = b.id
-        left join device_type c on b.device_type = c.id
+        device_log a inner join device b on a.device_id = b.id
+        inner join device_type c on b.device_type = c.id
        WHERE 1 = 1
        <if test="bo.deviceType != null">
            AND c.id = #{bo.deviceType}
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
@ -264,6 +264,44 @@
        </if>
    </select>

+    <select id="GetDeviceByName" resultType="map" >
+        select a.id,
+        a.device_type,
+        a.device_name,
+        a.device_mac,
+        a.type_name,
+        a.bluetooth_name,
+        a.device_imei
+        from device a
+        <where>
+            a.tenant_id = #{tenant_id} and
+            a.device_type = #{deviceType}
+            AND (
+            a.device_name=#{deviceName} or
+            a.bluetooth_name=#{deviceName}
+            )
+        </where>
+    </select>
+
+    <select id="getEquipCountByType" resultType="int">
+        select count(1) cnt
+        from device a
+        <where>
+            a.tenant_id = #{tenant_id} and
+            a.device_type = #{deviceType}
+        </where>
+    </select>
+
+    <select id="getEquipAllByType" resultType="map">
+        select device_mac,bluetooth_name,device_name
+        from device a
+        <where>
+            a.tenant_id = #{tenant_id} and
+            a.device_type = #{deviceType}
+        </where>
+
+    </select>
+
    <!-- 获取分配设备的客户 -->
    <select id="getAssignCustomer" resultType="com.fuyuanshen.equipment.domain.Device">
        SELECT *
Author	SHA1	Message	Date
dyf	03f453f901	Merge pull request 'refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块' (#25 ) from liwenlong/fys-Multi-tenant:jingquan into jingquan Reviewed-on: #25	2026-02-27 15:29:26 +08:00
DragonWenLong	e23c5267ee	refactor(equipment): 将业务文件和操作视频功能从app模块迁移到equipment模块 - 移动AppBusinessFile相关类到equipment模块 - 移动AppOperationVideo相关类到equipment模块 - 更新所有导入路径以指向新的equipment包结构 - 重构设备创建流程中的文件克隆逻辑 - 添加cloneFiles方法支持从设备类型复制文件和视频到新设备 - 优化DeviceXinghanBizService中的设备验证逻辑 - 更新Mapper XML命名空间和返回类型引用 - 调整设备导入Excel的必填字段验证规则	2026-02-27 15:13:53 +08:00
dyf	346792d5c1	Merge pull request 'feat(device): 新增阿里云语音通知功能并扩展设备查询接口' (#24 ) from liwenlong/fys-Multi-tenant:jingquan into jingquan Reviewed-on: #24	2026-01-30 16:06:57 +08:00
DragonWenLong	cb87871982	feat(device): 新增阿里云语音通知功能并扩展设备查询接口 - 集成阿里云语音服务，实现TTS语音拨号功能 - 添加异步报警拨号机制，支持SOS紧急呼叫 - 新增按设备名称查询设备的接口和SQL - 扩展设备类型统计和批量查询功能 - 添加租户ID字段支持多租户设备管理 - 配置阿里云语音API依赖和客户端单例模式	2026-01-30 16:03:13 +08:00
dyf	b280038502	Merge pull request 'fix(controller): 修复新增设备日志注解配置' (#23 ) from liwenlong/fys-Multi-tenant:jingquan into jingquan Reviewed-on: #23	2026-01-28 16:33:25 +08:00
DragonWenLong	3e119b1dd8	feat(device): 添加设备图片字段映射 - 在设备服务实现中添加设备图片字段的赋值逻辑 - 将设备类型中的图片信息同步到设备对象中	2026-01-19 16:39:01 +08:00
DragonWenLong	cab0884d7f	fix(controller): 修复新增设备日志注解配置 - 将 @Operation 注解替换为 @Log 注解以正确记录操作日志 - 保持新增设备功能的核心逻辑不变 - 确保日志标题正确显示为"新增设备"	2026-01-15 17:21:46 +08:00
dyf	ca11ef0e35	Merge pull request 'feat(equipment): 添加设备图片上传功能' (#22 ) from liwenlong/fys-Multi-tenant:jingquan into jingquan Reviewed-on: #22	2026-01-12 11:15:56 +08:00
DragonWenLong	ef2dc6a6f6	feat(equipment): 添加设备图片上传功能 - 在DeviceType实体类中新增devicePic字段用于存储设备图片 - 修改控制器方法参数从RequestBody改为ModelAttribute以支持文件上传 - 更新DeviceTypeForm表单类添加MultipartFile类型的file字段 - 实现图片上传服务集成OSS存储和文件哈希处理 - 添加HTTP到HTTPS的URL强制转换机制 - 更新数据库操作逻辑以支持图片路径存储 - 在设备创建流程中集成设备类型图片信息传递	2026-01-12 11:06:44 +08:00
daiyongfei	dff37b245a	Merge branch 'dyf-device' into 6170	2025-12-26 16:22:00 +08:00
chenyouting	6a058318f2	设备记录列表显示问题修改	2025-12-26 15:54:14 +08:00
daiyongfei	f2d74b8f17	Merge branch 'dyf-device' into 6170	2025-12-22 15:09:39 +08:00
chenyouting	aaf142ca67	提交	2025-12-19 17:55:48 +08:00