From c49aebafe55bca031c0c4f5c5fd45dad9ff46f32 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 20 Nov 2025 09:59:50 +0800
Subject: [PATCH] 优化
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
index b9c7713..417c3ca 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/DeviceServiceImpl.java
@@ -1,10 +1,7 @@
package com.ard.sample.manage.service.impl;
import com.alibaba.fastjson2.JSONObject;
-import com.ard.common.annotation.DataScope;
-import com.ard.common.annotation.DataScopePlus;
import com.ard.system.authorize.service.AuthorizeService;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -36,7 +33,6 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -616,6 +612,7 @@
// 验证授权数量
validateAuthorization(devicesList.size(), 1);
} catch (Exception e) {
+ log.error("保存设备时验证授权异常，请联系管理员！错误信息：" + e.getMessage());
return Optional.empty();
}
// 调用验证方法
@@ -877,6 +874,9 @@
BindDeviceReceiver dock = null;
BindDeviceReceiver drone = null;
for (BindDeviceReceiver device : devices) {
+ if(device.getDeviceModelKey().isEmpty()){
+ continue;
+ }
int val = Integer.parseInt(device.getDeviceModelKey().split("-")[0]);
if (val == DeviceDomainEnum.DOCK.getVal()) {
dock = device;
@@ -1247,7 +1247,7 @@
.sn(device.getDeviceSn())
.deviceCallsign(device.getNickname())
.isDeviceBindOrganization(device.getBoundStatus())
- .organizationId(device.getDeptId().toString())
+ .organizationId(String.valueOf(device.getDeptId()))
.organizationName(device.getWorkspaceName())
.build();
}
--
Gitblit v1.9.3