xp-robotaxi-map-boot/pom.xml
@@ -242,6 +242,12 @@ <artifactId>jts-core</artifactId> <version>1.19.0</version> <!-- 请使用最新版本 --> </dependency> <dependency> <groupId>com.xiaopeng.logan</groupId> <artifactId>xp-evi-oss-sdk</artifactId> <version>1.0.1-SNAPSHOT</version> <scope>compile</scope> </dependency> </dependencies> <build> xp-robotaxi-map-boot/src/main/java/com/xiaopeng/map/service/serviceimpl/XpPointServiceImpl.java
@@ -2,6 +2,8 @@ import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.xiaopeng.api.dto.operation.PointAddDto; @@ -23,6 +25,7 @@ import com.xiaopeng.common.core.utils.StringUtils; import com.xiaopeng.common.core.web.page.PageInfo; import com.xiaopeng.common.redis.service.RedisService; import com.xiaopeng.evi.oss.service.AliOssService; import com.xiaopeng.map.constant.I18nKeyConstant; import com.xiaopeng.map.dto.NearestDto; import com.xiaopeng.map.mapper.XpPointMapper; @@ -49,6 +52,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.io.UnsupportedEncodingException; import java.time.LocalTime; import java.util.*; import java.util.concurrent.TimeUnit; @@ -89,6 +93,9 @@ @Autowired private RedissonClient redissonClient; @Autowired private AliOssService aliOssService; @Override @Transactional @@ -294,6 +301,28 @@ @Override public List<XpPoint> listAll(PointListQuery query) { List<XpPoint> list = this.baseMapper.listAll(query); for (XpPoint xpPoint : list) { String pointPictures = xpPoint.getPointPictures(); if (org.apache.commons.lang3.StringUtils.isNotBlank(pointPictures)) { JSONArray jsonArray = JSONArray.parseArray(pointPictures); for (int i = 0; i < jsonArray.size(); i++) { JSONObject jsonObject = jsonArray.getJSONObject(i); if (Objects.isNull(jsonObject)) { continue; } String downloadUrl = jsonObject.getString("url");; try { downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { log.error("获取图片下载地址失败", e); } jsonObject.put("url", downloadUrl); } xpPoint.setPointPictures(JSONArray.toJSONString(jsonArray)); } } return list; }
@@ -2,6 +2,7 @@ import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -32,19 +33,16 @@ import com.xiaopeng.operation.vo.NearestNextVo; import com.xiaopeng.operation.vo.NearestVo; import com.xiaopeng.operation.vo.OrderDistanceVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.List; import java.util.*; import java.util.stream.Collectors; /** @@ -73,8 +71,10 @@ @Resource private IXpElectronicFenceService xpElectronicFenceService; @Autowired @Resource private AliOssService aliOssService; @Override public NearestVo nearest(NearestDto dto) { @@ -218,6 +218,28 @@ @Override public List<XpPoint> pointMap(PointMapQuery query) { List<XpPoint> list = this.baseMapper.pointMap(query); for (XpPoint xpPoint : list) { String pointPictures = xpPoint.getPointPictures(); if (org.apache.commons.lang3.StringUtils.isNotBlank(pointPictures)) { JSONArray jsonArray = JSONArray.parseArray(pointPictures); for (int i = 0; i < jsonArray.size(); i++) { JSONObject jsonObject = jsonArray.getJSONObject(i); if (Objects.isNull(jsonObject)) { continue; } String downloadUrl = jsonObject.getString("url");; try { downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { log.error("获取图片下载地址失败", e); } jsonObject.put("url", downloadUrl); } xpPoint.setPointPictures(JSONArray.toJSONString(jsonArray)); } } return list; } @@ -232,22 +254,31 @@ query.setOperationStatusIds(statusIds); } List<XpPoint> list = this.baseMapper.listAll(query); for (XpPoint xpPoint : list) { if (StringUtils.hasLength(xpPoint.getPointPictures())) { JSONObject jsonObject = JSONObject.parseObject(xpPoint.getPointPictures()); if(jsonObject!=null){ String downloadUrl = null; String pointPictures = xpPoint.getPointPictures(); if (org.apache.commons.lang3.StringUtils.isNotBlank(pointPictures)) { JSONArray jsonArray = JSONArray.parseArray(pointPictures); for (int i = 0; i < jsonArray.size(); i++) { JSONObject jsonObject = jsonArray.getJSONObject(i); if (Objects.isNull(jsonObject)) { continue; } String downloadUrl = jsonObject.getString("url");; try { // 1 downloadUrl= aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (Exception e) { e.printStackTrace(); downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { log.error("获取图片下载地址失败", e); } jsonObject.put("url", downloadUrl); xpPoint.setPointPictures(jsonObject.toJSONString()); } xpPoint.setPointPictures(JSONArray.toJSONString(jsonArray)); } } return list; }
@@ -2,6 +2,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -37,6 +38,7 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.io.UnsupportedEncodingException; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.*; @@ -260,18 +262,23 @@ xpPolicyApplicationVO.setVehicleCode(xpVehicle.getVehicleCode()); xpPolicyApplicationVO.setAuditRemarks(xpPolicyApplication.getAuditRemarks()); if (xpPolicyApplicationVO.getAuditStatus() == 2 && StringUtils.isNotBlank(xpVehicle.getPolicyInformation())) { JSONObject jsonObject = JSONObject.parseObject(xpVehicle.getPolicyInformation()); if(jsonObject!=null){ String downloadUrl = null; try { JSONArray jsonArray = JSONArray.parseArray(xpVehicle.getPolicyInformation()); for (int i = 0; i < jsonArray.size(); i++) { JSONObject jsonObject = jsonArray.getJSONObject(i); if (Objects.isNull(jsonObject)) { continue; } // 1 downloadUrl= aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (Exception e) { e.printStackTrace(); String downloadUrl = jsonObject.getString("url");; try { downloadUrl = aliOssService.getDownloadUrl(jsonObject.getString("id"), jsonObject.getString("name"), true); } catch (UnsupportedEncodingException e) { log.error("获取图片下载地址失败", e); } jsonObject.put("url", downloadUrl); } jsonObject.put("url", downloadUrl); xpPolicyApplicationVO.setPolicyInformation(jsonObject.toJSONString()); } xpPolicyApplicationVO.setPolicyInformation(JSONArray.toJSONString(jsonArray)); } } queryPolicyInfoVO.setStatus(xpPolicyApplication.getAuditStatus());
