记得上下班打卡 | git大法好,push需谨慎

Commit acfeadec authored by jiangxiulong's avatar jiangxiulong

经纬度为空不计算

parent 07dd3495
...@@ -105,8 +105,8 @@ public class KylinPerformancesController { ...@@ -105,8 +105,8 @@ public class KylinPerformancesController {
@ApiOperation("演出详情") @ApiOperation("演出详情")
public ResponseDto<HashMap<String, Object>> detail( public ResponseDto<HashMap<String, Object>> detail(
@PathVariable("performancesId") String performancesId, @PathVariable("performancesId") String performancesId,
@RequestParam("latitudeFrom") Double latitudeFrom, @RequestParam(value = "latitudeFrom", defaultValue = "0") double latitudeFrom,
@RequestParam("longitudeFrom") Double longitudeFrom @RequestParam(value = "longitudeFrom", defaultValue = "0") double longitudeFrom
) { ) {
HashMap<String, Object> result = kylinPerformancesService.detail(performancesId, latitudeFrom, longitudeFrom); HashMap<String, Object> result = kylinPerformancesService.detail(performancesId, latitudeFrom, longitudeFrom);
if (result != null) { if (result != null) {
......
package com.liquidnet.service.kylin.service.impl; package com.liquidnet.service.kylin.service.impl;
import com.liquidnet.common.cache.redis.util.RedisUtil; import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.CommonConst;
import com.liquidnet.commons.lang.util.DistanceUtil; import com.liquidnet.commons.lang.util.DistanceUtil;
import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum; import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
import com.liquidnet.service.kylin.constant.KylinRedisConst; import com.liquidnet.service.kylin.constant.KylinRedisConst;
...@@ -229,11 +230,13 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM ...@@ -229,11 +230,13 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus())); performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
// 处理距离 // 处理距离
String diffDistance = DistanceUtil.getDistance(longitudeFrom, latitudeFrom, Double.parseDouble(performancesInfo.getLongitude()), Double.parseDouble(performancesInfo.getLatitude())); if (longitudeFrom != CommonConst.DFT_DOUBLE_VAL) {
performancesInfo.setDiffDistance(diffDistance); String diffDistance = DistanceUtil.getDistance(longitudeFrom, latitudeFrom, Double.parseDouble(performancesInfo.getLongitude()), Double.parseDouble(performancesInfo.getLatitude()));
for (PerformanceVo road : roadList) { performancesInfo.setDiffDistance(diffDistance);
String diffDistanceRoad = DistanceUtil.getDistance(longitudeFrom, latitudeFrom, Double.parseDouble(performancesInfo.getLongitude()), Double.parseDouble(performancesInfo.getLatitude())); for (PerformanceVo road : roadList) {
road.setDiffDistance(diffDistanceRoad); String diffDistanceRoad = DistanceUtil.getDistance(longitudeFrom, latitudeFrom, Double.parseDouble(performancesInfo.getLongitude()), Double.parseDouble(performancesInfo.getLatitude()));
road.setDiffDistance(diffDistanceRoad);
}
} }
info.put("performancesInfo", performancesInfo); info.put("performancesInfo", performancesInfo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment