记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
acfeadec
Commit
acfeadec
authored
May 20, 2021
by
jiangxiulong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
经纬度为空不计算
parent
07dd3495
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
+10
-7
KylinPerformancesController.java
...service/kylin/controller/KylinPerformancesController.java
+2
-2
KylinPerformancesServiceImpl.java
...vice/kylin/service/impl/KylinPerformancesServiceImpl.java
+8
-5
No files found.
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinPerformancesController.java
View file @
acfeadec
...
@@ -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"
)
D
ouble
latitudeFrom
,
@RequestParam
(
value
=
"latitudeFrom"
,
defaultValue
=
"0"
)
d
ouble
latitudeFrom
,
@RequestParam
(
"longitudeFrom"
)
D
ouble
longitudeFrom
@RequestParam
(
value
=
"longitudeFrom"
,
defaultValue
=
"0"
)
d
ouble
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
)
{
...
...
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java
View file @
acfeadec
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,12 +230,14 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
...
@@ -229,12 +230,14 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
performancesInfo
.
setMessage
(
KylinPerformanceStatusEnum
.
getName
(
performancesInfo
.
getAppStatus
()));
performancesInfo
.
setMessage
(
KylinPerformanceStatusEnum
.
getName
(
performancesInfo
.
getAppStatus
()));
// 处理距离
// 处理距离
if
(
longitudeFrom
!=
CommonConst
.
DFT_DOUBLE_VAL
)
{
String
diffDistance
=
DistanceUtil
.
getDistance
(
longitudeFrom
,
latitudeFrom
,
Double
.
parseDouble
(
performancesInfo
.
getLongitude
()),
Double
.
parseDouble
(
performancesInfo
.
getLatitude
()));
String
diffDistance
=
DistanceUtil
.
getDistance
(
longitudeFrom
,
latitudeFrom
,
Double
.
parseDouble
(
performancesInfo
.
getLongitude
()),
Double
.
parseDouble
(
performancesInfo
.
getLatitude
()));
performancesInfo
.
setDiffDistance
(
diffDistance
);
performancesInfo
.
setDiffDistance
(
diffDistance
);
for
(
PerformanceVo
road
:
roadList
)
{
for
(
PerformanceVo
road
:
roadList
)
{
String
diffDistanceRoad
=
DistanceUtil
.
getDistance
(
longitudeFrom
,
latitudeFrom
,
Double
.
parseDouble
(
performancesInfo
.
getLongitude
()),
Double
.
parseDouble
(
performancesInfo
.
getLatitude
()));
String
diffDistanceRoad
=
DistanceUtil
.
getDistance
(
longitudeFrom
,
latitudeFrom
,
Double
.
parseDouble
(
performancesInfo
.
getLongitude
()),
Double
.
parseDouble
(
performancesInfo
.
getLatitude
()));
road
.
setDiffDistance
(
diffDistanceRoad
);
road
.
setDiffDistance
(
diffDistanceRoad
);
}
}
}
info
.
put
(
"performancesInfo"
,
performancesInfo
);
info
.
put
(
"performancesInfo"
,
performancesInfo
);
info
.
put
(
"roadList"
,
roadList
);
info
.
put
(
"roadList"
,
roadList
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment