admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

定位bug修复

Browse Source
This commit is contained in:
guo 2023-09-15 17:54:29 +08:00
parent 6e35b1aeb3
commit 8992b5ab35
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationDataServiceImpl.java
View File

@ -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()));

4
src/main/java/com/zhgd/xmgl/modules/location/service/impl/LocationTagLowVoltageAlarmServiceImpl.java
View File

@ -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();