Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
cfld-postcard-service
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
cfld-backend
cfld-postcard-service
Commits
aefec14b
Commit
aefec14b
authored
Dec 19, 2023
by
yaobaizheng
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
50423ce2
a731b27c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
3 deletions
+15
-3
ParkInfoServiceImpl.java
...service/moudle/park/service/impl/ParkInfoServiceImpl.java
+11
-3
ParkDetailVo.java
...ava/com/postcard/service/moudle/park/vo/ParkDetailVo.java
+4
-0
No files found.
src/main/java/com/postcard/service/moudle/park/service/impl/ParkInfoServiceImpl.java
View file @
aefec14b
...
@@ -30,6 +30,8 @@ import com.postcard.service.moudle.park.vo.ParkDetailVo;
...
@@ -30,6 +30,8 @@ import com.postcard.service.moudle.park.vo.ParkDetailVo;
import
com.postcard.service.moudle.park.vo.ParkIndustryVo
;
import
com.postcard.service.moudle.park.vo.ParkIndustryVo
;
import
com.postcard.service.moudle.park.vo.ParkPageVo
;
import
com.postcard.service.moudle.park.vo.ParkPageVo
;
import
com.postcard.service.moudle.system.service.SysCarouselInfoService
;
import
com.postcard.service.moudle.system.service.SysCarouselInfoService
;
import
com.postcard.service.moudle.system.vo.ResourceVo
;
import
com.postcard.service.moudle.system.vo.VrVo
;
import
com.postcard.service.util.CommonUtil
;
import
com.postcard.service.util.CommonUtil
;
import
com.postcard.service.util.DataUtil
;
import
com.postcard.service.util.DataUtil
;
import
lombok.extern.slf4j.Slf4j
;
import
lombok.extern.slf4j.Slf4j
;
...
@@ -89,7 +91,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
...
@@ -89,7 +91,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
parkInfoParam
.
setCoverAreaUnder
(
Double
.
valueOf
(
split
[
1
]));
parkInfoParam
.
setCoverAreaUnder
(
Double
.
valueOf
(
split
[
1
]));
}
}
}
}
if
(
StringUtils
.
isNotBlank
(
parkInfoParam
.
getPrimaryIndustry
()))
{
if
(
StringUtils
.
isNotBlank
(
parkInfoParam
.
getPrimaryIndustry
()))
{
String
name
=
PrimaryIndustryEnum
.
getName
(
parkInfoParam
.
getPrimaryIndustry
());
String
name
=
PrimaryIndustryEnum
.
getName
(
parkInfoParam
.
getPrimaryIndustry
());
String
[]
split
=
name
.
split
(
"、"
);
String
[]
split
=
name
.
split
(
"、"
);
parkInfoParam
.
setPrimaryIndustryList
(
Arrays
.
asList
(
split
));
parkInfoParam
.
setPrimaryIndustryList
(
Arrays
.
asList
(
split
));
...
@@ -112,8 +114,14 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
...
@@ -112,8 +114,14 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
// 获取园区基本信息
// 获取园区基本信息
ParkInfo
parkInfo
=
this
.
getById
(
id
);
ParkInfo
parkInfo
=
this
.
getById
(
id
);
ParkDetailVo
parkDetailVo
=
BeanUtil
.
copyProperties
(
parkInfo
,
ParkDetailVo
.
class
);
ParkDetailVo
parkDetailVo
=
BeanUtil
.
copyProperties
(
parkInfo
,
ParkDetailVo
.
class
);
ResourceVo
allResource
=
sysCarouselInfoService
.
getAllResource
(
CarouselTypeEnum
.
YUANQU
.
getType
(),
id
);
List
<
String
>
imgUrlList
=
allResource
.
getImgUrlList
();
List
<
VrVo
>
vrVoList
=
allResource
.
getVrVoList
();
// 轮播图
// 轮播图
parkDetailVo
.
setImgUrlList
(
sysCarouselInfoService
.
getImgUrls
(
CarouselTypeEnum
.
YUANQU
.
getType
(),
id
));
// parkDetailVo.setImgUrlList(sysCarouselInfoService.getImgUrls(CarouselTypeEnum.YUANQU.getType(), id));
parkDetailVo
.
setImgUrlList
(
imgUrlList
);
parkDetailVo
.
setVrUrlList
(
vrVoList
);
// 招商方向
// 招商方向
parkDetailVo
.
setInvestmentDetails
(
listInvestDetail
(
id
));
parkDetailVo
.
setInvestmentDetails
(
listInvestDetail
(
id
));
// 产业支持
// 产业支持
...
@@ -157,7 +165,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
...
@@ -157,7 +165,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
@Override
@Override
public
List
<
String
>
getIndustryList
()
{
public
List
<
String
>
getIndustryList
()
{
DevelopmentInfo
developmentInfo
=
developmentInfoService
.
getById
(
developmentId
);
DevelopmentInfo
developmentInfo
=
developmentInfoService
.
getById
(
developmentId
);
String
primaryIndustry
=
developmentInfo
.
getPrimaryIndustry
();
String
primaryIndustry
=
developmentInfo
.
getPrimaryIndustry
();
String
[]
split
=
primaryIndustry
.
split
(
"、"
);
String
[]
split
=
primaryIndustry
.
split
(
"、"
);
...
...
src/main/java/com/postcard/service/moudle/park/vo/ParkDetailVo.java
View file @
aefec14b
...
@@ -17,6 +17,7 @@ import org.springframework.format.annotation.DateTimeFormat;
...
@@ -17,6 +17,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import
javax.validation.constraints.NotNull
;
import
javax.validation.constraints.NotNull
;
import
java.math.BigDecimal
;
import
java.math.BigDecimal
;
import
java.util.ArrayList
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
@@ -122,4 +123,7 @@ public class ParkDetailVo {
...
@@ -122,4 +123,7 @@ public class ParkDetailVo {
@ApiModelProperty
(
value
=
"状态"
)
@ApiModelProperty
(
value
=
"状态"
)
private
Integer
status
;
private
Integer
status
;
@ApiModelProperty
(
value
=
"vr图"
)
private
List
<
VrVo
>
vrUrlList
=
new
ArrayList
<>();
}
}
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