Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
H
hzsomms
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
ZTGK
hzsomms
Commits
462ff938
Commit
462ff938
authored
Jul 31, 2023
by
hkl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:1.获取首页tree字段调整
parent
9cdd2b7d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
24 deletions
+21
-24
LightRailMapper.xml
...eecg/modules/subwayNetwork/mapper/xml/LightRailMapper.xml
+1
-4
SubwaySectionMapper.xml
.../modules/subwayNetwork/mapper/xml/SubwaySectionMapper.xml
+11
-11
TrainStationMapper.xml
...g/modules/subwayNetwork/mapper/xml/TrainStationMapper.xml
+6
-7
SectionStationNode.java
...rg/jeecg/modules/subwayNetwork/vo/SectionStationNode.java
+3
-2
No files found.
jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/mapper/xml/LightRailMapper.xml
View file @
462ff938
...
@@ -59,10 +59,7 @@
...
@@ -59,10 +59,7 @@
true isLeaf
true isLeaf
FROM
FROM
t_sn_light_rail
t_sn_light_rail
<where>
WHERE status = 1
1=1
AND status = 1
</where>
<!-- UNION ALL
<!-- UNION ALL
SELECT
SELECT
concat(id,'-2') id,
concat(id,'-2') id,
...
...
jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/mapper/xml/SubwaySectionMapper.xml
View file @
462ff938
...
@@ -40,15 +40,15 @@
...
@@ -40,15 +40,15 @@
'2' level,
'2' level,
t.light_rail_id parent,
t.light_rail_id parent,
t.line_alias_id,
t.line_alias_id,
t3.line_alias_code,
t.light_rail_id,
t.light_rail_id,
t.section_starting_mileage startMileage,
t.section_starting_mileage startMileage,
TRUNCATE((t.section_end_mileage + t.section_starting_mileage) / 2, 3) centerMileage,
TRUNCATE((t.section_end_mileage + t.section_starting_mileage) / 2, 3) centerMileage,
t.section_end_mileage endMileage,
t.section_end_mileage endMileage,
true isLeaf
true isLeaf
FROM t_sn_subway_section t left join t_sn_light_rail t2 ON t.light_rail_id = t2.id
FROM t_sn_subway_section t
<where>
LEFT JOIN t_sn_light_rail t2 ON t.light_rail_id = t2.id
1=1
LEFT JOIN t_sn_line_alias t3 ON t.line_alias_id = t3.id
AND t2.status = 1
WHERE t2.status = 1
</where>
</select>
</select>
</mapper>
</mapper>
\ No newline at end of file
jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/mapper/xml/TrainStationMapper.xml
View file @
462ff938
...
@@ -39,16 +39,15 @@
...
@@ -39,16 +39,15 @@
'3' level,
'3' level,
t2.section_id parent,
t2.section_id parent,
t1.line_alias_id,
t1.line_alias_id,
t4.line_alias_code,
t1.starting_mileage startMileage,
t1.starting_mileage startMileage,
t1.center_mileage centerMileage,
t1.center_mileage centerMileage,
t1.end_mileage endMileage,
t1.end_mileage endMileage,
true isLeaf
true isLeaf
FROM
FROM
t_sn_train_station t1
t_sn_train_station t1
LEFT JOIN t_sn_section_station_map t2 ON t1.id = t2.station_id
LEFT JOIN t_sn_section_station_map t2 ON t1.id = t2.station_id
LEFT JOIN t_sn_light_rail t3 on t1.light_rail_id = t3.id and t2.light_rail_id = t3.id
LEFT JOIN t_sn_light_rail t3 on t1.light_rail_id = t3.id and t2.light_rail_id = t3.id
<where>
LEFT JOIN t_sn_line_alias t4 ON t1.line_alias_id = t4.id
1=1
WHERE t3.status = 1
AND t3.status = 1
</where>
</select>
</select>
</mapper>
</mapper>
\ No newline at end of file
jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/vo/SectionStationNode.java
View file @
462ff938
package
org
.
jeecg
.
modules
.
subwayNetwork
.
vo
;
package
org
.
jeecg
.
modules
.
subwayNetwork
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -28,6 +26,9 @@ public class SectionStationNode {
...
@@ -28,6 +26,9 @@ public class SectionStationNode {
@ApiModelProperty
(
value
=
"线别id"
)
@ApiModelProperty
(
value
=
"线别id"
)
private
String
lineAliasId
;
private
String
lineAliasId
;
@ApiModelProperty
(
value
=
"线别code【冠号】"
)
private
String
lineAliasCode
;
@ApiModelProperty
(
value
=
"起始里程"
)
@ApiModelProperty
(
value
=
"起始里程"
)
private
BigDecimal
startMileage
;
private
BigDecimal
startMileage
;
...
...
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