From 8992b5ab35e19eca338338af5ebf3279842589a3 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Fri, 15 Sep 2023 17:54:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=BD=8Dbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../location/service/impl/LocationDataServiceImpl.java        | 4 ++--
 .../service/impl/LocationTagLowVoltageAlarmServiceImpl.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java
index 81f30c1c3..df27aee19 100644
--- a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zhgd.xmgl.modules.location.service.impl;
 
+import cn.hutool.core.codec.Base64;
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -8,7 +9,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gexin.fastjson.JSON;
 import com.gexin.fastjson.TypeReference;
-import com.sun.jersey.core.util.Base64;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.modules.location.entity.LocationData;
@@ -62,7 +62,7 @@ public class LocationDataServiceImpl extends ServiceImpl<LocationDataMapper, Loc
     public JiLianDaRt uploadLocationDataList(HashMap<String, Object> paramMap) {
         long l = IdUtil.getSnowflake().nextId();
         String data = MapUtils.getString(paramMap, "data");
-        List<LocationData> locationDataList = JSON.parseObject(Base64.base64Decode(data), new TypeReference<List<LocationData>>() {
+        List<LocationData> locationDataList = JSON.parseObject(Base64.decodeStr(data), new TypeReference<List<LocationData>>() {
         });
         for (LocationData locationData : locationDataList) {
             LocationTunnel tunnel = locationTunnelMapper.selectOne(new LambdaQueryWrapper<LocationTunnel>().eq(LocationTunnel::getTunnelId, locationData.getRegionId()));
diff --git a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationTagLowVoltageAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationTagLowVoltageAlarmServiceImpl.java
index 9e4c90d96..20ff7efb0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationTagLowVoltageAlarmServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationTagLowVoltageAlarmServiceImpl.java
@@ -1,8 +1,8 @@
 package com.zhgd.xmgl.modules.location.service.impl;
 
+import cn.hutool.core.codec.Base64;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gexin.fastjson.JSON;
-import com.sun.jersey.core.util.Base64;
 import com.zhgd.xmgl.modules.location.entity.LocationTagLowVoltageAlarm;
 import com.zhgd.xmgl.modules.location.entity.dto.JiLianDaRt;
 import com.zhgd.xmgl.modules.location.mapper.LocationTagLowVoltageAlarmMapper;
@@ -24,7 +24,7 @@ public class LocationTagLowVoltageAlarmServiceImpl extends ServiceImpl<LocationT
     @Override
     public JiLianDaRt uploadSensorAlarm(HashMap<String, Object> paramMap) {
         String data = MapUtils.getString(paramMap, "data");
-        LocationTagLowVoltageAlarm alarm = JSON.parseObject(Base64.base64Decode(data), LocationTagLowVoltageAlarm.class);
+        LocationTagLowVoltageAlarm alarm = JSON.parseObject(Base64.decodeStr(data), LocationTagLowVoltageAlarm.class);
         alarm.setProjectSn(alarm.getProjectId());
         baseMapper.insert(alarm);
         return JiLianDaRt.success();