关键词搜索url解码

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<DeviceAccumulateData> handleDeviceAccumulateData(AccumulateDataSearchParam pageSearchParam) {
 		List<DeviceAccumulateData> 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);

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<DeviceAlarmData> handleDeviceAlarmData(Integer languageType, AlarmDataSearchParam pageSearchParam) {
 		List<DeviceAlarmData> 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);

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<DeviceBaStatusData> handleDeviceBaStatusData(BaStatusDataSearchParam pageSearchParam) {
 		List<DeviceBaStatusData> 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);

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<DeviceMeasureData> handleDeviceMeasureData(MeasureDataSearchParam pageSearchParam) {
 		List<DeviceMeasureData> 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);