From 4d71579aef114f21a225bb2e7a59631488f0d76e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 27 三月 2025 15:43:28 +0800
Subject: [PATCH] 站点类型修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/DeviceSiteServiceImpl.java | 11 +++++++----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java
index 0563c68..6b915c8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/params/DeviceSiteParame.java
@@ -20,12 +20,12 @@
private List<Long> typeIds;
@ApiModelProperty("浣滀笟绔欑偣")
- private List<String> sites;
+ private String sites;
@ApiModelProperty("璁惧缂栧彿")
private String deviceCode;
@ApiModelProperty("璁惧浣滀笟绔欑偣")
- private List<String> deviceSites;
+ private String deviceSites;
}
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 9328ef1..33a5a6c 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
@@ -1,5 +1,6 @@
package com.vincent.rsf.server.manager.service.impl;
+import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.DeviceSiteParame;
@@ -30,18 +31,20 @@
throw new CoolException("鍒濆鍖栧け璐ワ細 鍒犻櫎绔欑偣澶辫触锛侊紒");
}
}
- if (Objects.isNull(param.getDeviceSites()) || param.getDeviceSites().isEmpty()) {
+ if (Objects.isNull(param.getDeviceSites()) || StringUtils.isBlank(param.getDeviceSites())) {
throw new CoolException("鍒濆鍖栧け璐ワ細 璁惧浣滀笟绔欑偣涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(param.getSites()) || param.getSites().isEmpty()) {
+ if (Objects.isNull(param.getSites()) || StringUtils.isBlank(param.getSites())) {
throw new CoolException("鍒濆鍖栧け璐�: 浣滀笟绔欑偣涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(param.getTypeIds()) || param.getTypeIds().isEmpty()) {
throw new CoolException("鍒濆鍖栧け璐ワ細 浣滀笟绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
+ List<String> sites = Arrays.asList(StringUtils.split(param.getSites(), ","));
+ List<String> dvSites = Arrays.asList(StringUtils.split(param.getDeviceSites(), ","));
List<DeviceSite> deviceSites = new ArrayList<>();
- for (String site : param.getSites()) {
- for (String deviceSite : param.getDeviceSites()) {
+ for (String site : sites) {
+ for (String deviceSite : dvSites) {
for (Long id : param.getTypeIds()) {
DeviceSite site1 = new DeviceSite();
site1.setType(id + "")
--
Gitblit v1.9.1