Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
cfld-region-outline
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-region-outline
Commits
1d59db45
Commit
1d59db45
authored
Dec 29, 2023
by
yaobaizheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
默认图修改
parent
f8303fb9
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
20 deletions
+13
-20
DevelopmentInfoAllVO.java
src/main/java/com/lyy/admin/VO/DevelopmentInfoAllVO.java
+2
-2
ParkInfoAllVO.java
src/main/java/com/lyy/admin/VO/ParkInfoAllVO.java
+2
-2
DevelopmentInfoController.java
...controller/developmentinfo/DevelopmentInfoController.java
+2
-2
ParkInfoController.java
...com/lyy/admin/controller/parkinfo/ParkInfoController.java
+2
-2
DevelopmentInfoServiceImpl.java
...vice/developmentinfo/impl/DevelopmentInfoServiceImpl.java
+3
-6
ParkInfoServiceImpl.java
.../lyy/admin/service/parkinfo/impl/ParkInfoServiceImpl.java
+2
-6
No files found.
src/main/java/com/lyy/admin/VO/DevelopmentInfoAllVO.java
View file @
1d59db45
...
...
@@ -15,8 +15,8 @@ import java.util.Map;
@Data
public
class
DevelopmentInfoAllVO
{
//
@JsonSerialize(using = DefaultImgUrlList.class)
private
List
<
S
ysCarouselInfo
>
sysCarouselInfos
=
new
ArrayList
<>();
@JsonSerialize
(
using
=
DefaultImgUrlList
.
class
)
private
List
<
S
tring
>
sysCarouselInfos
=
new
ArrayList
<>();
private
DevelopmentInfoVO
developmentInfoVO
=
new
DevelopmentInfoVO
();
private
List
<
ParkInfoListVO
>
ParkInfoListVO
=
new
ArrayList
<>();
// private List<DevelopmentTrafficInfo> developmentTrafficInfoList = new ArrayList<>();
...
...
src/main/java/com/lyy/admin/VO/ParkInfoAllVO.java
View file @
1d59db45
...
...
@@ -24,8 +24,8 @@ public class ParkInfoAllVO implements Serializable {
private
List
<
ParkTrafficInfo
>
parkTrafficInfo
=
new
ArrayList
<>();
private
JSONArray
parkTrafficInfoVOs
=
new
JSONArray
();
private
List
<
String
>
parkCarrierInfo
=
new
ArrayList
<>();
//
@JsonSerialize(using = DefaultImgUrlList.class)
private
List
<
S
ysCarouselInfo
>
sysCarouselInfos
=
new
ArrayList
<>();
@JsonSerialize
(
using
=
DefaultImgUrlList
.
class
)
private
List
<
S
tring
>
sysCarouselInfos
=
new
ArrayList
<>();
private
List
<
CarrierInfoTypeListVO
>
carrierInfoVO
=
new
ArrayList
<>();
private
List
<
ParkInvestmentDirectionInfo
>
parkInvestmentDirectionInfos
=
new
ArrayList
<>();
private
static
final
long
serialVersionUID
=
1L
;
...
...
src/main/java/com/lyy/admin/controller/developmentinfo/DevelopmentInfoController.java
View file @
1d59db45
...
...
@@ -47,7 +47,7 @@ public class DevelopmentInfoController extends BaseController {
@ApiImplicitParam
(
name
=
"orderByColumn"
,
value
=
"排序字段(可为空,传类属性)"
,
type
=
"String"
),
@ApiImplicitParam
(
name
=
"isAsc"
,
value
=
"排序字段(可为空,请传asc或者desc)"
,
type
=
"String"
)
})
@EncryptBusiness
//
@EncryptBusiness
public
TableDataInfo
list
(
DevelopmentInfoParam
developmentInfoParam
)
{
boolean
login
=
isLogin
();
String
status
=
DevelopmentStatusEnum
.
STATUS_YRZ
.
getCode
()+
","
+
DevelopmentStatusEnum
.
STATUS_DRZ
.
getCode
();
...
...
@@ -73,7 +73,7 @@ public class DevelopmentInfoController extends BaseController {
@ResponseBody
@ApiOperation
(
value
=
"某个开发区信息"
,
notes
=
"rest风格传参,将参数拼接在url上"
)
@ApiImplicitParam
(
name
=
"id"
,
value
=
"开发区id"
,
type
=
"Long"
)
@EncryptBusiness
//
@EncryptBusiness
public
DevelopmentInfoAllVO
get
(
@PathVariable
Long
id
)
{
return
developmentInfoSerivce
.
getDevelopmentInfo
(
id
,
getUserInfo
().
getUserId
(),
getUserInfo
().
getIsMembership
());
}
...
...
src/main/java/com/lyy/admin/controller/parkinfo/ParkInfoController.java
View file @
1d59db45
...
...
@@ -57,7 +57,7 @@ public class ParkInfoController extends BaseController {
@ApiImplicitParam
(
name
=
"orderByColumn"
,
value
=
"排序字段(可为空,传类属性)"
,
type
=
"String"
),
@ApiImplicitParam
(
name
=
"isAsc"
,
value
=
"排序字段(可为空,请传asc或者desc)"
,
type
=
"String"
)
})
@EncryptBusiness
//
@EncryptBusiness
public
TableDataInfo
list
(
ParkInfoParam
parkInfoParam
)
{
boolean
login
=
isLogin
();
String
status
=
ParkInfoEnum
.
STATUS_YRZ
.
getCode
()+
","
+
ParkInfoEnum
.
STATUS_DRZ
.
getCode
();
...
...
@@ -87,7 +87,7 @@ public class ParkInfoController extends BaseController {
@ResponseBody
@ApiOperation
(
value
=
"获取某个园区信息"
,
notes
=
"rest风格传参,将参数拼接在url上"
)
@ApiImplicitParam
(
name
=
"id"
,
value
=
"园区id"
,
type
=
"Long"
)
@EncryptBusiness
//
@EncryptBusiness
public
ParkInfoAllVO
get
(
@PathVariable
Long
id
)
{
return
parkInfoService
.
getParkInfo
(
id
,
getUserInfo
().
getUserId
(),
getUserInfo
().
getIsMembership
());
}
...
...
src/main/java/com/lyy/admin/service/developmentinfo/impl/DevelopmentInfoServiceImpl.java
View file @
1d59db45
...
...
@@ -385,12 +385,9 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
tWrapper
.
eq
(
SysCarouselInfo:
:
getType
,
yuanquId
).
eq
(
SysCarouselInfo:
:
getAssociationId
,
id
)
.
eq
(
SysCarouselInfo:
:
getUrlType
,
UrlTypeEnum
.
PIC
.
getCode
()).
eq
(
SysCarouselInfo:
:
getStatus
,
StatusEnum
.
ENABLE
.
getCode
());
List
<
SysCarouselInfo
>
sysCarouselInfos
=
sysCarouselInfoService
.
list
(
tWrapper
);
if
(
CollectionUtils
.
isEmpty
(
sysCarouselInfos
)){
SysCarouselInfo
sysCarouselInfo
=
new
SysCarouselInfo
();
sysCarouselInfo
.
setImgUrl
(
"https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/b0ec7298f5fb3f30e1ef974ba2b987e.jpg"
);
sysCarouselInfos
.
add
(
sysCarouselInfo
);
}
developmentInfoAllVO
.
setSysCarouselInfos
(
sysCarouselInfos
);
List
<
String
>
collect
=
sysCarouselInfos
.
stream
().
map
(
data
->
data
.
getImgUrl
()).
collect
(
Collectors
.
toList
());
developmentInfoAllVO
.
setSysCarouselInfos
(
collect
);
return
developmentInfoAllVO
;
}
...
...
src/main/java/com/lyy/admin/service/parkinfo/impl/ParkInfoServiceImpl.java
View file @
1d59db45
...
...
@@ -404,12 +404,8 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
tWrapper
.
eq
(
SysCarouselInfo:
:
getType
,
yuanquId
).
eq
(
SysCarouselInfo:
:
getAssociationId
,
id
)
.
eq
(
SysCarouselInfo:
:
getUrlType
,
UrlTypeEnum
.
PIC
.
getCode
()).
eq
(
SysCarouselInfo:
:
getStatus
,
StatusEnum
.
ENABLE
.
getCode
());
List
<
SysCarouselInfo
>
sysCarouselInfos
=
sysCarouselInfoService
.
list
(
tWrapper
);
if
(
CollectionUtils
.
isEmpty
(
sysCarouselInfos
)){
SysCarouselInfo
sysCarouselInfo
=
new
SysCarouselInfo
();
sysCarouselInfo
.
setImgUrl
(
"https://cfld-hw-obs-01.obs.cn-north-4.myhuaweicloud.com/lyy/img/b0ec7298f5fb3f30e1ef974ba2b987e.jpg"
);
sysCarouselInfos
.
add
(
sysCarouselInfo
);
}
parkInfoAllVO
.
setSysCarouselInfos
(
sysCarouselInfos
);
List
<
String
>
collect
=
sysCarouselInfos
.
stream
().
map
(
data
->
data
.
getImgUrl
()).
collect
(
Collectors
.
toList
());
parkInfoAllVO
.
setSysCarouselInfos
(
collect
);
return
parkInfoAllVO
;
}
...
...
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