From e711c834aec2293c53b07efe53e81e3573c289b6 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 01 四月 2026 11:42:44 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
index 5ddaebe..2204f98 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java
@@ -37,7 +37,8 @@
@Transactional(rollbackFor = Exception.class)
public boolean initSites(DeviceSiteParame param) {
if (param.getFlagInit() != null && param.getFlagInit() == 1) {
- List<DeviceSite> list = this.list(new LambdaQueryWrapper<DeviceSite>().select(DeviceSite::getId).last("limit 1"));
+// List<DeviceSite> list = this.list(new LambdaQueryWrapper<DeviceSite>().select(DeviceSite::getId).last("limit 1"));
+ List<DeviceSite> list = this.list(new LambdaQueryWrapper<DeviceSite>());
if (!list.isEmpty()) {
if (!this.remove(new LambdaQueryWrapper<>())) {
throw new CoolException("鍒濆鍖栧け璐ワ細 鍒犻櫎绔欑偣澶辫触锛侊紒");
@@ -81,17 +82,17 @@
String targetVal = truncate(row.getTarget().trim(), TARGET_MAX_LENGTH);
String commonName = StringUtils.isNotBlank(param.getName()) ? param.getName().trim() : null;
String commonLabel = StringUtils.isNotBlank(param.getLabel()) ? param.getLabel().trim() : null;
- ds.setType(String.valueOf(typeId))
- .setSite(siteName)
- .setDevice(param.getDeviceType())
- .setDeviceSite(deviceSiteName)
- .setTarget(targetVal)
- .setDeviceCode(param.getDeviceCode())
- .setAreaIdStart(param.getAreaIdStart())
- .setAreaIdEnd(param.getAreaIdEnd())
- .setChannel(ch)
- .setName(commonName != null ? commonName : (deviceSiteName + "-" + siteName + "-" + targetVal + "-" + ch))
- .setLabel(commonLabel);
+// ds.setType(String.valueOf(typeId))
+// .setSite(siteName)
+// .setDevice(param.getDeviceType())
+// .setDeviceSite(deviceSiteName)
+// .setTarget(targetVal)
+// .setDeviceCode(param.getDeviceCode())
+//// .setAreaIdStart(param.getAreaIdStart())
+//// .setAreaIdEnd(param.getAreaIdEnd())
+// .setChannel(ch)
+// .setName(commonName != null ? commonName : (deviceSiteName + "-" + siteName + "-" + targetVal + "-" + ch))
+// .setLabel(commonLabel);
deviceSites.add(ds);
}
}
--
Gitblit v1.9.1