From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 2a1a189..9f28a03 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,25 +37,32 @@
if (Objects.isNull(param.getDeviceSites()) || StringUtils.isBlank(param.getDeviceSites())) {
throw new CoolException("鍒濆鍖栧け璐ワ細 璁惧浣滀笟绔欑偣涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(param.getSites()) || StringUtils.isBlank(param.getSites())) {
+ if (Objects.isNull(param.getSite()) || StringUtils.isBlank(param.getSite())) {
throw new CoolException("鍒濆鍖栧け璐�: 浣滀笟绔欑偣涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(param.getTypeIds()) || param.getTypeIds().isEmpty()) {
throw new CoolException("鍒濆鍖栧け璐ワ細 浣滀笟绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
- List<String> sites = Arrays.asList(StringUtils.split(param.getSites(), ","));
+ if (Objects.isNull(param.getTarget()) || param.getTarget().isEmpty()) {
+ throw new CoolException("鍒濆鍖栧け璐ワ細 鐩爣绔欑偣涓嶈兘涓虹┖锛侊紒");
+ }
+ List<String> sites = Arrays.asList(StringUtils.split(param.getSite(), ","));
List<String> dvSites = Arrays.asList(StringUtils.split(param.getDeviceSites(), ","));
+ List<String> targets = Arrays.asList(StringUtils.split(param.getTarget(), ","));
List<DeviceSite> deviceSites = new ArrayList<>();
for (String site : sites) {
for (String deviceSite : dvSites) {
for (Long id : param.getTypeIds()) {
- DeviceSite site1 = new DeviceSite();
- site1.setType(id + "")
- .setSite(site)
- .setDevice(param.getDeviceType())
- .setDeviceSite(deviceSite)
- .setDeviceCode(param.getDeviceCode());
- deviceSites.add(site1);
+ for (String target : targets) {
+ DeviceSite site1 = new DeviceSite();
+ site1.setType(id + "")
+ .setSite(site)
+ .setDevice(param.getDeviceType())
+ .setDeviceSite(deviceSite)
+ .setTarget(target)
+ .setDeviceCode(param.getDeviceCode());
+ deviceSites.add(site1);
+ }
}
}
}
--
Gitblit v1.9.1