Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
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
项目统一框架
amos-boot-biz
Commits
d769d545
Commit
d769d545
authored
Aug 11, 2023
by
caotao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.大屏三维地图跳转预警分析修改
parent
e8c2b830
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
1 deletion
+9
-1
StationInfoDto.java
...eejoin/amos/boot/module/jxiop/api/dto/StationInfoDto.java
+2
-0
StationRecordInfo.java
...oin/amos/boot/module/jxiop/api/dto/StationRecordInfo.java
+4
-0
StationBasicMapper.xml
...xiop-api/src/main/resources/mapper/StationBasicMapper.xml
+1
-0
StationBasicServiceImpl.java
...odule/jxiop/biz/service/impl/StationBasicServiceImpl.java
+2
-1
No files found.
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/StationInfoDto.java
View file @
d769d545
...
@@ -33,6 +33,8 @@ public class StationInfoDto {
...
@@ -33,6 +33,8 @@ public class StationInfoDto {
@ApiModelProperty
(
value
=
"场站名称"
)
@ApiModelProperty
(
value
=
"场站名称"
)
private
String
stationName
;
private
String
stationName
;
@ApiModelProperty
(
value
=
"场站code"
)
private
String
stationCode
;
@ApiModelProperty
(
value
=
"场站类型"
)
@ApiModelProperty
(
value
=
"场站类型"
)
private
String
type
;
private
String
type
;
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/StationRecordInfo.java
View file @
d769d545
...
@@ -43,4 +43,8 @@ public class StationRecordInfo {
...
@@ -43,4 +43,8 @@ public class StationRecordInfo {
@ApiModelProperty
(
value
=
"场站坐标偏移量"
)
@ApiModelProperty
(
value
=
"场站坐标偏移量"
)
private
String
titlePos
;
private
String
titlePos
;
@ApiModelProperty
(
value
=
"场站code"
)
private
String
stationCode
;
}
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/StationBasicMapper.xml
View file @
d769d545
...
@@ -113,6 +113,7 @@
...
@@ -113,6 +113,7 @@
station_basic.station_type stationType,
station_basic.station_type stationType,
station_basic.station_flag stationFlag,
station_basic.station_flag stationFlag,
station_basic.area_code areaCode,
station_basic.area_code areaCode,
station_basic.project_org_code stationCode,
station_basic.jump_path,
station_basic.jump_path,
station_basic.title_pos titlePos,
station_basic.title_pos titlePos,
station_basic.risk_level riskLevel,
station_basic.risk_level riskLevel,
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationBasicServiceImpl.java
View file @
d769d545
...
@@ -311,7 +311,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
...
@@ -311,7 +311,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
list
.
addAll
(
stationBasicMapper
.
getStationList
(
null
));
list
.
addAll
(
stationBasicMapper
.
getStationList
(
null
));
}
}
List
<
StationRecordInfo
>
stationRecordInfoList
=
list
.
stream
().
filter
(
stationRecordInfo
->
!
org
.
springframework
.
util
.
ObjectUtils
.
isEmpty
(
stationRecordInfo
.
getTitlePos
())).
collect
(
Collectors
.
toList
());
List
<
StationRecordInfo
>
stationRecordInfoList
=
list
.
stream
().
filter
(
stationRecordInfo
->
!
org
.
springframework
.
util
.
ObjectUtils
.
isEmpty
(
stationRecordInfo
.
getTitlePos
())).
collect
(
Collectors
.
toList
());
//
便利
返回给地图的数据并对数据进行处理
//
遍历
返回给地图的数据并对数据进行处理
stationRecordInfoList
.
forEach
(
stationRecordInfo
->
{
stationRecordInfoList
.
forEach
(
stationRecordInfo
->
{
StationInfoDto
stationInfoDto
=
new
StationInfoDto
();
StationInfoDto
stationInfoDto
=
new
StationInfoDto
();
stationInfoDto
.
setStationId
(
stationRecordInfo
.
getStationId
());
stationInfoDto
.
setStationId
(
stationRecordInfo
.
getStationId
());
...
@@ -330,6 +330,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
...
@@ -330,6 +330,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto, Statio
for
(
String
s
:
original
)
{
for
(
String
s
:
original
)
{
doubleList
.
add
(
Double
.
parseDouble
(
s
));
doubleList
.
add
(
Double
.
parseDouble
(
s
));
}
}
stationInfoDto
.
setStationCode
(
stationRecordInfo
.
getStationCode
());
stationInfoDto
.
setTitlePos
(
doubleList
);
stationInfoDto
.
setTitlePos
(
doubleList
);
stationInfoDto
.
setIndicatorData
(
indicatorList
);
stationInfoDto
.
setIndicatorData
(
indicatorList
);
stationInfoDto
.
setRiskLevel
(
stationRecordInfo
.
getRiskLevel
());
stationInfoDto
.
setRiskLevel
(
stationRecordInfo
.
getRiskLevel
());
...
...
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