From dcb532fc3eb8aa3486ffc32f5d0557a3f169587a Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Thu, 6 Nov 2025 10:21:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AF=8D=E6=90=9C=E7=B4=A2ur?= =?UTF-8?q?l=E8=A7=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceDataAccumulateServiceImpl.java | 10 ++++++++++ .../back/service/impl/DeviceDataAlarmServiceImpl.java | 10 ++++++++++ .../service/impl/DeviceDataBaStatusServiceImpl.java | 10 ++++++++++ .../service/impl/DeviceDataMeasureServiceImpl.java | 10 ++++++++++ 4 files changed, 40 insertions(+) diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAccumulateServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAccumulateServiceImpl.java index cd8cf98..93ae39c 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAccumulateServiceImpl.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAccumulateServiceImpl.java @@ -1,5 +1,7 @@ package com.dongjian.dashboard.back.service.impl; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZoneId; @@ -70,6 +72,14 @@ public class DeviceDataAccumulateServiceImpl implements DeviceDataAccumulateServ public List handleDeviceAccumulateData(AccumulateDataSearchParam pageSearchParam) { List resultList; + if (StringUtils.isNotBlank(pageSearchParam.getKeyword())) { + try { + pageSearchParam.setKeyword(URLDecoder.decode(pageSearchParam.getKeyword(), StandardCharsets.UTF_8)); + } catch (Exception e) { + logger.error("URLDecoder.decode error", e); + } + } + pageSearchParam.setTypeIdList(Constants.CATEGORY_DEVICE_TYPE_MAP.get(Constants.CATEGORY_ACCUMULATE)); if (null != pageSearchParam.getDeviceGroupId()){ resultList = deviceInfoMapperExt.getDevice4AccumulateDataByGroup(pageSearchParam); diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAlarmServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAlarmServiceImpl.java index a0f2bec..b8e3a91 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAlarmServiceImpl.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAlarmServiceImpl.java @@ -29,6 +29,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.*; import java.util.stream.Collectors; @@ -78,6 +80,14 @@ public class DeviceDataAlarmServiceImpl implements DeviceDataAlarmService { public List handleDeviceAlarmData(Integer languageType, AlarmDataSearchParam pageSearchParam) { List resultList; + if (StringUtils.isNotBlank(pageSearchParam.getKeyword())) { + try { + pageSearchParam.setKeyword(URLDecoder.decode(pageSearchParam.getKeyword(), StandardCharsets.UTF_8)); + } catch (Exception e) { + logger.error("URLDecoder.decode error", e); + } + } + pageSearchParam.setTypeIdList(Constants.CATEGORY_DEVICE_TYPE_MAP.get(Constants.CATEGORY_ALARM)); if (null != pageSearchParam.getDeviceGroupId()){ resultList = deviceInfoMapperExt.getDevice4AlarmDataByGroup(pageSearchParam); diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java index 199016e..7c3cdd8 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java @@ -19,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.util.*; @Service @@ -62,6 +64,14 @@ public class DeviceDataBaStatusServiceImpl implements DeviceDataBaStatusService public List handleDeviceBaStatusData(BaStatusDataSearchParam pageSearchParam) { List resultList; + if (StringUtils.isNotBlank(pageSearchParam.getKeyword())) { + try { + pageSearchParam.setKeyword(URLDecoder.decode(pageSearchParam.getKeyword(), StandardCharsets.UTF_8)); + } catch (Exception e) { + logger.error("URLDecoder.decode error", e); + } + } + pageSearchParam.setTypeIdList(Constants.CATEGORY_DEVICE_TYPE_MAP.get(Constants.CATEGORY_STATUS)); if (null != pageSearchParam.getDeviceGroupId()){ resultList = deviceInfoMapperExt.getDevice4BaStatusDataByGroup(pageSearchParam); diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataMeasureServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataMeasureServiceImpl.java index 6c00b35..fd648f2 100644 --- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataMeasureServiceImpl.java +++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataMeasureServiceImpl.java @@ -24,6 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.net.URLDecoder; +import java.nio.charset.StandardCharsets; import java.time.LocalDate; import java.time.ZoneId; import java.util.*; @@ -73,6 +75,14 @@ public class DeviceDataMeasureServiceImpl implements DeviceDataMeasureService { public List handleDeviceMeasureData(MeasureDataSearchParam pageSearchParam) { List resultList; + if (StringUtils.isNotBlank(pageSearchParam.getKeyword())) { + try { + pageSearchParam.setKeyword(URLDecoder.decode(pageSearchParam.getKeyword(), StandardCharsets.UTF_8)); + } catch (Exception e) { + logger.error("URLDecoder.decode error", e); + } + } + pageSearchParam.setTypeIdList(Constants.CATEGORY_DEVICE_TYPE_MAP.get(Constants.CATEGORY_MEASURE)); if (null != pageSearchParam.getDeviceGroupId()){ resultList = deviceInfoMapperExt.getDevice4MeasureDataByGroup(pageSearchParam);