Merge branch 'dyf-device' into prod

Merge branch '6170' into prod
2025-12-19 16:22:55 +08:00 · 2025-12-19 14:08:03 +08:00 · 2025-12-12 14:59:50 +08:00 · 2025-12-03 16:56:49 +08:00 · 2025-12-01 13:33:59 +08:00 · 2025-11-28 10:18:54 +08:00
57 changed files with 181 additions and 511 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.equipment.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
 import com.fuyuanshen.app.domain.dto.AppFileDto;
-import com.fuyuanshen.equipment.domain.vo.AppFileVo;
+import com.fuyuanshen.app.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.equipment.domain.bo.AppOperationVideoBo;
-import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;
-import com.fuyuanshen.equipment.service.IAppOperationVideoService;
+import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.app.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,7 +26,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

 import java.util.List;
-import java.util.Map;

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

    // @Log("新增设备")
-    @Log(title = "新增设备")
+    @Operation(summary = "新增设备")
    @PostMapping(value = "/add")
    public R<Void> addDevice(@RequestBody DeviceForm deviceForm) {
        try {
@ -145,26 +144,4 @@ 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,14 +1,13 @@
 package com.fuyuanshen.app.service;

-import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
 import com.fuyuanshen.app.domain.dto.AppFileDto;
-import com.fuyuanshen.equipment.domain.vo.AppBusinessFileVo;
-import com.fuyuanshen.equipment.domain.vo.AppFileVo;
+import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.app.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/global/mqtt/config/MqttOutboundConfiguration.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttOutboundConfiguration.java
@ -15,14 +15,11 @@ import org.springframework.messaging.MessageHandler;
@Configuration
@Slf4j
 public class MqttOutboundConfiguration {
-
    @Autowired
    private MqttPropertiesConfig mqttPropertiesConfig;
-
    @Autowired
    private MqttPahoClientFactory mqttPahoClientFactory;
-
-
+ 
    // 消息通道
    @Bean
    public MessageChannel mqttOutboundChannel(){
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/DeviceRedisKeyConstants.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/DeviceRedisKeyConstants.java
@ -1,7 +1,6 @@
 package com.fuyuanshen.global.mqtt.constants;

 public class DeviceRedisKeyConstants {
-
    public static final String DEVICE_KEY_PREFIX = "device:";
    // 设备上报状态
    public static final String DEVICE_STATUS_KEY_PREFIX = ":status";
@ -53,5 +52,4 @@ public class DeviceRedisKeyConstants {
     * 告警信息
     */
    public static final String DEVICE_ALARM_MESSAGE_KEY_PREFIX = ":alarmMessage";
-
 }
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/LightingCommandTypeConstants.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/LightingCommandTypeConstants.java
@ -36,6 +36,7 @@ public class LightingCommandTypeConstants {
     */
    public static final String SEND_MESSAGE = "Light_6";

+
    /**
     * 报警模式
     */
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqAlarmRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqAlarmRule.java
@ -57,12 +57,12 @@ public class BjqAlarmRule implements MqttMessageRule {
            if (StringUtils.isNotBlank(convertValue)) {
                // 将设备状态信息存储到Redis中
                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX;
-                String sendMessageIng = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
+                String sendMessageIng = GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
                if ("1".equals(convertValue)) {
                    RedisUtils.setCacheObject(sendMessageIng, "1", Duration.ofDays(1));
                    // 存储到Redis
                    RedisUtils.setCacheObject(deviceRedisKey, "1");
-                } else if ("0".equals(convertValue)) {
+                }else if ("0".equals(convertValue)){
                    RedisUtils.deleteObject(sendMessageIng);
                    RedisUtils.deleteObject(deviceRedisKey);
                }
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLaserModeSettingsRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLaserModeSettingsRule.java
@ -71,4 +71,5 @@ public class BjqLaserModeSettingsRule implements MqttMessageRule {
    }


+
 }
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqModeRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqModeRule.java
@ -45,7 +45,6 @@ public class BjqModeRule implements MqttMessageRule {
        return LightingCommandTypeConstants.LIGHT_MODE;
    }

-
    @Override
    public void execute(MqttRuleContext context) {
        String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();
--- a/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqPersonnelInfoDataRule.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqPersonnelInfoDataRule.java
@ -1,18 +1,32 @@
 package com.fuyuanshen.global.mqtt.rule.bjq;

+import com.alibaba.fastjson2.JSONObject;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.equipment.utils.map.GetAddressFromLatUtil;
+import com.fuyuanshen.equipment.utils.map.LngLonUtil;
 import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
 import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
 import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.constants.MqttConstants;
 import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

 import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;

 import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;

 /**
 * 定位数据命令处理
@ -41,5 +55,4 @@ public class BjqPersonnelInfoDataRule implements MqttMessageRule {
            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(30));
        }
    }
-
 }
--- a/fys-admin/src/main/java/com/fuyuanshen/global/queue/MqttMessageConsumer.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/queue/MqttMessageConsumer.java
@ -27,12 +27,11 @@ public class MqttMessageConsumer {

    @Autowired
    private DeviceMapper deviceMapper;
-
+    
    // 创建两个线程池：一个用于消息获取，一个用于业务处理
    private ExecutorService messageConsumerPool = Executors.newFixedThreadPool(3);
    private ExecutorService messageProcessorPool = Executors.newFixedThreadPool(10);

-
    // 初始化方法，启动消息监听
    @PostConstruct
    public void start() {
@ -131,5 +130,4 @@ public class MqttMessageConsumer {
            log.error("业务处理线程 {} 处理消息时发生错误: {}", threadName, message, e);
        }
    }
-
 }
--- a/fys-admin/src/main/java/com/fuyuanshen/global/queue/OnlineStatusTask.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/global/queue/OnlineStatusTask.java
@ -22,8 +22,6 @@ public class OnlineStatusTask {

    @Autowired
    private DeviceMapper deviceMapper;
-
-
    // 使用cron表达式，每分钟的第0秒执行
    @Scheduled(cron = "0 */3 * * * ?")
    public void cronTask() {
@ -39,5 +37,4 @@ public class OnlineStatusTask {
            }
        });
    }
-
 }
--- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java
+++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java
@ -98,7 +98,6 @@ public class DeviceControlCenterController extends BaseController {
        return R.ok(appDeviceService.getDeviceInfo(deviceMac));
    }

-
    /**
     * 指令下发记录
     */
@ -107,7 +106,6 @@ public class DeviceControlCenterController extends BaseController {
        return appDeviceService.getInstructionRecord(dto, pageQuery);
    }

-
    /**
     * 导出
     */
--- 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,15 +1,19 @@
 package com.fuyuanshen.web.controller.device;

-import com.fuyuanshen.equipment.domain.bo.AppOperationVideoBo;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
 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;
@ -24,6 +28,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

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

 /**
 * 联调中心
@ -119,7 +125,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,7 +1,10 @@
 package com.fuyuanshen.web.domain.vo;

-import com.fuyuanshen.equipment.domain.vo.AppFileVo;
-import com.fuyuanshen.equipment.domain.vo.AppOperationVideoVo;
+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 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.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.AppBusinessFile;
+import com.fuyuanshen.app.domain.AppOperationVideo;
+import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
 import com.fuyuanshen.app.domain.dto.AppFileDto;
-import com.fuyuanshen.equipment.service.IAppBusinessFileService;
-import com.fuyuanshen.equipment.service.IAppOperationVideoService;
+import com.fuyuanshen.app.service.IAppBusinessFileService;
+import com.fuyuanshen.app.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,17 +15,20 @@ 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;
@ -37,6 +40,7 @@ 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;
@ -47,23 +51,26 @@ 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;
@ -84,11 +91,8 @@ 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;

    /**
     * 所有档位的描述表
@ -131,6 +135,7 @@ 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("设备不存在"));
@ -142,24 +147,6 @@ 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业务] 拨号指令下发失败，请检查配置或余额");
-        }
-    }
-
    /**
     * 设置强制报警
     */
@ -714,31 +701,20 @@ public class DeviceXinghanBizService {
        return deviceTypeMapper.findAll(criteria);
    }

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

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

        DeviceTypeQueryCriteria queryCriteria = new DeviceTypeQueryCriteria();
        queryCriteria.setDeviceTypeId(deviceForm.getDeviceType());
@ -763,7 +739,6 @@ 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());
@ -772,14 +747,6 @@ 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());
@ -800,23 +767,4 @@ 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
@ -1,87 +0,0 @@
-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-admin/src/main/resources/application-jingquan.yml
+++ b/fys-admin/src/main/resources/application-jingquan.yml
@ -8,8 +8,8 @@ spring.boot.admin.client:
    metadata:
      username: ${spring.boot.admin.client.username}
      userpassword: ${spring.boot.admin.client.password}
-  username: @monitor.username@
-  password: @monitor.password@
+  username: ${monitor.username}
+  password: ${monitor.password}

 --- # snail-job 配置
 snail-job:
--- a/fys-admin/src/main/resources/application-prod.yml
+++ b/fys-admin/src/main/resources/application-prod.yml
@ -11,8 +11,8 @@ spring.boot.admin.client:
    metadata:
      username: ${spring.boot.admin.client.username}
      userpassword: ${spring.boot.admin.client.password}
-  username: @monitor.username@
-  password: @monitor.password@
+  username: ${monitor.username}
+  password: ${monitor.password}

 --- # snail-job 配置
 snail-job:
--- a/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/SystemConstants.java
+++ b/fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/SystemConstants.java
@ -77,9 +77,4 @@ public interface SystemConstants {
     */
    String ROOT_DEPT_ANCESTORS = "0";

-    /**
-     * 菜单ID
-     */
-    public static final Long RESTRICTED_MENU_ID = 102L;
-
 }
--- 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.equipment.domain.vo.AppBusinessFileVo;
-import com.fuyuanshen.equipment.domain.bo.AppBusinessFileBo;
-import com.fuyuanshen.equipment.service.IAppBusinessFileService;
+import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.app.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.equipment.domain.vo.AppOperationVideoVo;
-import com.fuyuanshen.equipment.domain.bo.AppOperationVideoBo;
-import com.fuyuanshen.equipment.service.IAppOperationVideoService;
+import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.app.service.IAppOperationVideoService;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;

 /**
--- 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.equipment.domain;
+package com.fuyuanshen.app.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.equipment.domain;
+package com.fuyuanshen.app.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/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.equipment.domain.bo;
+package com.fuyuanshen.app.domain.bo;

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

-import com.fuyuanshen.equipment.domain.AppOperationVideo;
+import com.fuyuanshen.app.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/vo/AppBusinessFileVo.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppBusinessFileVo.java
@ -1,13 +1,17 @@
-package com.fuyuanshen.equipment.domain.vo;
+package com.fuyuanshen.app.domain.vo;

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

-import com.fuyuanshen.equipment.domain.AppOperationVideo;
+import com.fuyuanshen.app.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/mapper/AppBusinessFileMapper.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/AppBusinessFileMapper.java
@ -1,10 +1,10 @@
-package com.fuyuanshen.equipment.mapper;
+package com.fuyuanshen.app.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.equipment.mapper;
+package com.fuyuanshen.app.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/service/IAppBusinessFileService.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/IAppBusinessFileService.java
@ -1,11 +1,11 @@
-package com.fuyuanshen.equipment.service;
+package com.fuyuanshen.app.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,9 +57,7 @@ public interface IAppBusinessFileService {
     * @param bo 批量新增app业务文件
     * @return 是否新增成功
     */
-    Boolean insertBatch(Collection<AppBusinessFile> bo, Boolean isBatch);
-
-    void cloneFiles(Long sourceId, Long targetId);
+    Boolean insertBatch(Collection<AppBusinessFile> bo,Boolean isBatch);

    /**
     * 修改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,10 +1,11 @@
-package com.fuyuanshen.equipment.service;
+package com.fuyuanshen.app.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;
@ -58,8 +59,6 @@ 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,29 +1,27 @@
-package com.fuyuanshen.equipment.service.impl;
+package com.fuyuanshen.app.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.equipment.service.IAppBusinessFileService;
-import org.springframework.transaction.annotation.Transactional;
+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 java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
-import java.util.stream.Collectors;

 /**
 * app业务文件Service业务层处理
@ -119,38 +117,6 @@ 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,8 +1,7 @@
-package com.fuyuanshen.equipment.service.impl;
+package com.fuyuanshen.app.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;
@ -10,20 +9,18 @@ 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 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 java.util.List;
 import java.util.Map;
 import java.util.Collection;
-import java.util.stream.Collectors;

 /**
 * 操作视频Service业务层处理
@ -128,37 +125,6 @@ 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/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.equipment.mapper.AppBusinessFileMapper">
+<mapper namespace="com.fuyuanshen.app.mapper.AppBusinessFileMapper">

-    <select id="queryAppFileList" resultType="com.fuyuanshen.equipment.domain.vo.AppFileVo">
+    <select id="queryAppFileList" resultType="com.fuyuanshen.app.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.equipment.mapper.AppOperationVideoMapper">
+<mapper namespace="com.fuyuanshen.app.mapper.AppOperationVideoMapper">

 </mapper>
--- a/fys-modules/fys-equipment/pom.xml
+++ b/fys-modules/fys-equipment/pom.xml
@ -140,18 +140,6 @@
            <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,7 +317,8 @@ 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,7 +15,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

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

 /**
@ -51,7 +50,7 @@ public class DeviceTypeController {
    // @Log("新增设备类型")
    @Operation(summary = "新增设备类型")
    @PostMapping(value = "/add")
-    public R<Void> createDeviceType(@Validated @ModelAttribute DeviceTypeForm resources) throws IOException {
+    public R<Void> createDeviceType(@Validated @RequestBody DeviceType resources) {
        deviceTypeService.create(resources);
        return R.ok();
    }
@ -60,7 +59,7 @@ public class DeviceTypeController {
    // @Log("修改设备类型")
    @Operation(summary = "修改设备类型")
    @PutMapping(value = "/update")
-    public  R<Void>  updateDeviceType(@Validated @ModelAttribute DeviceTypeForm resources) throws IOException {
+    public  R<Void>  updateDeviceType(@Validated @RequestBody DeviceTypeForm resources) {
        deviceTypeService.update(resources);
        return R.ok();
    }
@ -80,6 +79,7 @@ public class DeviceTypeController {
    public R<DeviceType>  getCommunicationMode(@Parameter(name = "设备类型ID", required = true) Long id) {
        DeviceType communicationMode = deviceTypeService.getCommunicationMode(id);
        return R.ok(communicationMode);
+
    }

 }
--- 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/DeviceType.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java
@ -85,8 +85,5 @@ 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/form/DeviceForm.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceForm.java
@ -54,9 +54,6 @@ 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,7 +2,6 @@ package com.fuyuanshen.equipment.domain.form;

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

 /**
 * @Description: 设备类型
@ -49,10 +48,5 @@ 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/excel/UploadDeviceDataListener.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/excel/UploadDeviceDataListener.java
@ -12,7 +12,6 @@ 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;
@ -438,10 +437,8 @@ 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(deviceTypeForm);
+                    params.getDeviceTypeService().create(newDeviceType);

                    // 重新查询确保获取到正确的ID
                    deviceType = params.getDeviceTypeService().queryByName(device.getTypeName());
--- 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,7 +5,6 @@ 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;
@ -149,10 +148,4 @@ 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,7 +8,6 @@ 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;

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

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

    /**
     * 多选删除
--- 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,7 +30,10 @@ 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.*;
+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.utils.FileHashUtil;
 import com.fuyuanshen.system.domain.vo.SysOssVo;
 import com.fuyuanshen.system.domain.vo.SysRoleVo;
@ -74,8 +77,6 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme

    private final DeviceFenceAccessRecordMapper deviceFenceAccessRecordMapper;
    private final FileHashUtil fileHashUtil;
-    private final IAppBusinessFileService appBusinessFileService;
-    private final IAppOperationVideoService appOperationVideoService;


    /**
@ -324,7 +325,6 @@ 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,12 +333,6 @@ 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,16 +19,12 @@ 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;
@ -50,8 +46,6 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
    private final DeviceAssignmentsMapper deviceAssignmentsMapper;

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


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

        // 校验设备类型名称
        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();
-        deviceType.setCustomerId(loginUser.getUserId());
-        deviceType.setOwnerCustomerId(loginUser.getUserId());
-        deviceType.setOriginalOwnerId(loginUser.getUserId());
-        deviceType.setCreateByName(loginUser.getNickname());
-        deviceTypeMapper.insert(deviceType);
+        resources.setCustomerId(loginUser.getUserId());
+        resources.setOwnerCustomerId(loginUser.getUserId());
+        resources.setOriginalOwnerId(loginUser.getUserId());
+        resources.setCreateByName(loginUser.getNickname());
+        deviceTypeMapper.insert(resources);

        // 自动授权给自己
        DeviceTypeGrants deviceTypeGrants = new DeviceTypeGrants();
-        deviceTypeGrants.setDeviceTypeId(deviceType.getId());
+        deviceTypeGrants.setDeviceTypeId(resources.getId());
        deviceTypeGrants.setCustomerId(loginUser.getUserId());
        deviceTypeGrants.setGrantorCustomerId(loginUser.getUserId());
        deviceTypeGrants.setGrantedAt(new Date());
@ -233,7 +213,7 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
-    public void update(DeviceTypeForm resources) throws IOException {
+    public void update(DeviceTypeForm resources) {
        DeviceTypeGrants deviceTypeGrants = deviceTypeGrantsMapper.selectById(resources.getId());
        if (deviceTypeGrants == null) {
            throw new RuntimeException("设备类型不存在");
@ -244,13 +224,22 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
            throw new RuntimeException("设备类型不存在");
        }

+
+
        if (!deviceType.getTypeName().equals(resources.getTypeName())) {
            int count = deviceMapper.countByDeviceTypeId(deviceType.getId());
            if (count > 0) {
-                throw new RuntimeException("该设备类型下已有设备，无法修改设备类型名称!!!");
+                throw new RuntimeException("该设备类型下已有绑定设备，无法修改设备类型名称!!!");
            }
        }

+
+        // List<Device> devices = deviceMapper.selectList(new QueryWrapper<Device>()
+        //         .eq("device_type", deviceTypeGrants.getDeviceTypeId()));
+        // if (CollectionUtil.isNotEmpty(devices)) {
+        //     throw new RuntimeException("该设备类型已绑定设备，无法修改！！！");
+        // }
+
        // 校验设备类型名称
        DeviceType dt = deviceTypeMapper.selectOne(new QueryWrapper<DeviceType>().eq("type_name", resources.getTypeName()));
        if (dt != null && !dt.getId().equals(deviceType.getId())) {
@ -264,17 +253,6 @@ 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/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 inner join device b on a.device_id = b.id
-        inner join device_type c on b.device_type = c.id
+        device_log a left join device b on a.device_id = b.id
+        left 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,44 +264,6 @@
        </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 *
--- a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysMenuController.java
+++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysMenuController.java
@ -36,7 +36,6 @@ public class SysMenuController extends BaseController {

    private final ISysMenuService menuService;

-
    /**
     * 获取路由信息
     *
@ -48,7 +47,6 @@ public class SysMenuController extends BaseController {
        return R.ok(menuService.buildMenus(menus));
    }

-
    /**
     * 获取菜单列表
     */
--- a/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysMenuServiceImpl.java
+++ b/fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysMenuServiceImpl.java
@ -31,7 +31,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import java.util.*;
-import java.util.stream.Collectors;

 /**
 * 菜单 业务层处理
@ -142,17 +141,10 @@ public class SysMenuServiceImpl implements ISysMenuService {
            menus = baseMapper.selectMenuTreeAll();
        } else {
            menus = baseMapper.selectMenuTreeByUserId(userId);
-            // 如果不是超级管理员且不是租户管理员，则过滤掉受限制的菜单
-            // if (!LoginHelper.isAdmin()) {
-            menus = menus.stream()
-                    .filter(menu -> !SystemConstants.RESTRICTED_MENU_ID.equals(menu.getMenuId()))
-                    .collect(Collectors.toList());
-            // }
        }
        return getChildPerms(menus, 0);
    }

-
    /**
     * 根据角色ID查询菜单树信息
     *
--- a/pom.xml
+++ b/pom.xml
@ -85,10 +85,10 @@
                <monitor.username>fys</monitor.username>
                <monitor.password>123456</monitor.password>
            </properties>
-            <activation>
-                <!-- 默认环境 -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <!-- <activation> -->
+            <!--     &lt;!&ndash; 默认环境 &ndash;&gt; -->
+            <!--     <activeByDefault>true</activeByDefault> -->
+            <!-- </activation> -->
        </profile>
        <profile>
            <id>prod</id>
@ -98,10 +98,10 @@
                <monitor.username>fys</monitor.username>
                <monitor.password>123456</monitor.password>
            </properties>
-            <!-- <activation> -->
-            <!--     &lt;!&ndash; 默认环境 &ndash;&gt; -->
-            <!--     <activeByDefault>true</activeByDefault> -->
-            <!-- </activation> -->
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
        </profile>
        <profile>
            <id>jingquan</id>
Author	SHA1	Message	Date
daiyongfei	7d256df790	Merge branch 'dyf-device' into prod	2025-12-19 16:22:55 +08:00
daiyongfei	3d1c2f4e56	Merge branch 'dyf-device' into prod	2025-12-19 14:08:03 +08:00
daiyongfei	ccadcb8d4e	Merge branch '6170' into prod	2025-12-12 14:59:50 +08:00
daiyongfei	b8cb663bbf	Merge branch 'jingquan' into prod	2025-12-03 16:56:49 +08:00
daiyongfei	56e86b070d	Merge branch 'dyf-device' into prod	2025-12-01 13:33:59 +08:00
daiyongfei	0898855108	Merge branch '6170' into prod	2025-11-28 10:18:54 +08:00
daiyongfei	92b65ce6df	Merge branch 'dyf-device' into prod	2025-11-27 11:01:58 +08:00
daiyongfei	82399cffed	Merge branch 'dyf-device' into prod	2025-08-25 14:33:52 +08:00
daiyongfei	5538ac96e5	晶全日志配置	2025-08-06 09:48:00 +08:00
daiyongfei	b703f80355	晶全日志配置	2025-08-06 09:44:52 +08:00
daiyongfei	b3b249ea07	日志配置	2025-08-06 09:20:41 +08:00
daiyongfei	aff424e73b	Merge branch 'main' into prod	2025-08-06 09:18:43 +08:00
daiyongfei	dc513a858a	Merge branch 'main' into prod	2025-08-04 09:08:34 +08:00
daiyongfei	df5ce7ddd9	Merge branch 'main' into prod	2025-07-31 09:21:10 +08:00
daiyongfei	2174dfdb4d	Merge branch 'main' into prod	2025-07-23 19:24:27 +08:00
daiyongfei	2800b89e06	Merge branch 'main' into prod	2025-07-23 10:55:30 +08:00
daiyongfei	637e46c510	Merge branch 'main' into prod	2025-07-21 08:40:34 +08:00
daiyongfei	31c2158c8e	Merge branch 'main' into prod	2025-07-19 10:22:33 +08:00
daiyongfei	c7c21dc358	Merge branch 'main' into prod	2025-07-18 15:17:54 +08:00
daiyongfei	a7e0803b00	Merge branch 'main' into prod	2025-07-17 16:42:14 +08:00
daiyongfei	55cacbd322	Merge branch 'main' into prod	2025-07-17 09:24:45 +08:00
daiyongfei	99ec6eaff0	prod	2025-07-15 08:40:20 +08:00