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
9a49dc64
Commit
9a49dc64
authored
Dec 19, 2023
by
yaobaizheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
返回相关产业园列表
parent
d78df78e
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
67 additions
and
14 deletions
+67
-14
DefaultImgUrl.java
...java/com/postcard/service/config/other/DefaultImgUrl.java
+4
-4
CarrierPageVo.java
...com/postcard/service/moudle/carrier/vo/CarrierPageVo.java
+1
-1
DevelopmentInfoServiceImpl.java
.../development/service/impl/DevelopmentInfoServiceImpl.java
+13
-8
ParkInfoMapper.java
...m/postcard/service/moudle/park/mapper/ParkInfoMapper.java
+4
-0
ParkInfoService.java
...postcard/service/moudle/park/service/ParkInfoService.java
+8
-0
ParkInfoServiceImpl.java
...service/moudle/park/service/impl/ParkInfoServiceImpl.java
+29
-0
StarObjectExtensionInfoVO.java
...tartObjectExtensionInfo/VO/StarObjectExtensionInfoVO.java
+8
-1
No files found.
src/main/java/com/postcard/service/config/other/DefaultImgUrl.java
View file @
9a49dc64
...
...
@@ -53,10 +53,10 @@ public class DefaultImgUrl extends JsonSerializer<String> {
String
imgUrl
,
JsonGenerator
jsonGenerator
,
SerializerProvider
serializerProvider
)
throws
IOException
{
Object
currentValue
=
jsonGenerator
.
getCurrentValue
();
Class
<?>
aClass1
=
currentValue
.
getClass
();
Object
annotationValue
=
AnnotationUtil
.
getAnnotationValue
(
aClass1
,
BusinessType
.
class
);
BusinessTypeEnum
businessTypeEnum
=
BusinessTypeEnum
.
valueOf
(
annotationValue
.
toString
());
//
Object currentValue = jsonGenerator.getCurrentValue();
//
Class<?> aClass1 = currentValue.getClass();
//
Object annotationValue = AnnotationUtil.getAnnotationValue(aClass1, BusinessType.class);
//
BusinessTypeEnum businessTypeEnum = BusinessTypeEnum.valueOf(annotationValue.toString());
...
...
src/main/java/com/postcard/service/moudle/carrier/vo/CarrierPageVo.java
View file @
9a49dc64
...
...
@@ -22,7 +22,7 @@ import java.math.BigDecimal;
@NoArgsConstructor
@ToString
@ApiModel
(
value
=
"载体分页返回数据"
)
@BusinessType
(
BusinessTypeEnum
.
CARRIER
)
//
@BusinessType(BusinessTypeEnum.CARRIER)
public
class
CarrierPageVo
{
@ApiModelProperty
(
value
=
"主键id"
)
private
Integer
id
;
...
...
src/main/java/com/postcard/service/moudle/development/service/impl/DevelopmentInfoServiceImpl.java
View file @
9a49dc64
...
...
@@ -22,7 +22,9 @@ import com.postcard.service.moudle.development.vo.DevelopmentDetailVo;
import
com.postcard.service.moudle.development.vo.DevelopmentPolicyVo
;
import
com.postcard.service.moudle.development.vo.DevelopmentSourceVo
;
import
com.postcard.service.moudle.land.service.LandInfoService
;
import
com.postcard.service.moudle.park.dto.ParkPageDto
;
import
com.postcard.service.moudle.park.service.ParkInfoService
;
import
com.postcard.service.moudle.park.vo.ParkPageVo
;
import
com.postcard.service.moudle.startObjectExtensionInfo.VO.StarObjectExtensionInfoVO
;
import
com.postcard.service.moudle.startObjectExtensionInfo.domain.StarObjectExtensionInfo
;
import
com.postcard.service.moudle.startObjectExtensionInfo.service.StarObjectExtensionInfoService
;
...
...
@@ -75,7 +77,7 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
@Autowired
StarObjectExtensionInfoService
starObjectExtensionInfoService
;
@Autowired
ScSourceInfoService
scSourceInfoService
;
@Autowired
CarrierInfoService
carrierInfoService
;
//
@Autowired CarrierInfoService carrierInfoService;
@Value
(
"${development.id}"
)
private
Integer
developMentId
;
...
...
@@ -165,17 +167,20 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
developmentDetailVo
.
setInvestmentLights
(
detail
.
get
(
FactorCostEnum
.
LIGHT
.
getName
()));
List
<
StarObjectExtensionInfoVO
>
starObjectExtensionInfoVOS
=
detail
.
get
(
FactorCostEnum
.
INDUSRTY
.
getName
());
// starObjectExtensionInfoVOS.forEach(e->{
// CarrierPageDto carrierPageDto = new CarrierPageDto();
// carrierPageDto.setDevelopmentId(developMentId);
// carrierPageDto.setPrimaryIndustry(e.getTitle());
// e.setCarrirList(carrierInfoService.list(carrierPageDto));
// });
starObjectExtensionInfoVOS
.
forEach
(
e
->{
CarrierPageDto
carrierPageDto
=
new
Carrier
PageDto
();
carrier
PageDto
.
setDevelopmentId
(
developMentId
);
carrier
PageDto
.
setPrimaryIndustry
(
e
.
getTitle
());
e
.
set
CarrirList
(
carrierInfoService
.
list
(
carrier
PageDto
));
ParkPageDto
parkPageDto
=
new
Park
PageDto
();
park
PageDto
.
setDevelopmentId
(
developMentId
);
park
PageDto
.
setPrimaryIndustry
(
e
.
getTitle
());
e
.
set
ParkList
(
parkInfoService
.
noPageList
(
park
PageDto
));
});
developmentDetailVo
.
setPrimaryIndustrys
(
detail
.
get
(
FactorCostEnum
.
INDUSRTY
.
getName
()));
//要素成本
LambdaQueryWrapper
<
ScSourceInfoEntity
>
lambdaQueryWrapper
=
new
LambdaQueryWrapper
<>();
lambdaQueryWrapper
.
eq
(
ScSourceInfoEntity:
:
getDevelopmentId
,
developMentId
);
...
...
src/main/java/com/postcard/service/moudle/park/mapper/ParkInfoMapper.java
View file @
9a49dc64
...
...
@@ -8,6 +8,8 @@ import com.postcard.service.moudle.park.vo.ParkPageVo;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
/**
* @author 26996
* @description 针对表【park_info】的数据库操作Mapper
...
...
@@ -19,6 +21,8 @@ public interface ParkInfoMapper extends BaseMapper<ParkInfo> {
Page
<
ParkPageVo
>
pageList
(
Page
pageFromEntity
,
@Param
(
"param"
)
ParkPageDto
parkInfoParam
);
List
<
ParkPageVo
>
pageList
(
@Param
(
"param"
)
ParkPageDto
parkInfoParam
);
}
...
...
src/main/java/com/postcard/service/moudle/park/service/ParkInfoService.java
View file @
9a49dc64
...
...
@@ -31,6 +31,14 @@ public interface ParkInfoService extends IService<ParkInfo> {
**/
Page
<
ParkPageVo
>
pageList
(
ParamEntity
<
ParkPageDto
>
param
);
/**
* @description: 不分页查询园区列表
* @date: 2023/11/21 9:51
* @param: [param]
* @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.lyy.admin.VO.ParkInfoListVO>
**/
List
<
ParkPageVo
>
noPageList
(
ParkPageDto
parkPageDto
);
/**
* @description: 园区详情
* @date: 2023/11/21 17:40
...
...
src/main/java/com/postcard/service/moudle/park/service/impl/ParkInfoServiceImpl.java
View file @
9a49dc64
...
...
@@ -102,6 +102,35 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo>
return
pageInfo
;
}
/**
* @description: 分页查询园区列表
* @date: 2023/11/21 9:51
* @param: [param]
* @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.lyy.admin.VO.ParkInfoListVO>
**/
@Override
public
List
<
ParkPageVo
>
noPageList
(
ParkPageDto
parkInfoParam
)
{
TimeInterval
timer
=
DateUtil
.
timer
();
parkInfoParam
.
setDevelopmentId
(
developmentId
);
String
coverArea
=
parkInfoParam
.
getCoverArea
();
if
(
ObjectUtils
.
isNotEmpty
(
coverArea
))
{
String
[]
split
=
coverArea
.
split
(
"-"
);
parkInfoParam
.
setCoverAreaUp
(
Double
.
valueOf
(
split
[
0
]));
if
(
split
.
length
>
1
)
{
parkInfoParam
.
setCoverAreaUnder
(
Double
.
valueOf
(
split
[
1
]));
}
}
if
(
StringUtils
.
isNotBlank
(
parkInfoParam
.
getPrimaryIndustry
()))
{
String
name
=
PrimaryIndustryEnum
.
getName
(
parkInfoParam
.
getPrimaryIndustry
());
String
[]
split
=
name
.
split
(
"、"
);
parkInfoParam
.
setPrimaryIndustryList
(
Arrays
.
asList
(
split
));
}
List
<
ParkPageVo
>
pageInfo
=
this
.
baseMapper
.
pageList
(
parkInfoParam
);
log
.
info
(
"park时间消耗:{}"
,
timer
.
intervalRestart
());
return
pageInfo
;
}
/**
* @description: 园区详情
* @date: 2023/11/21 17:40
...
...
src/main/java/com/postcard/service/moudle/startObjectExtensionInfo/VO/StarObjectExtensionInfoVO.java
View file @
9a49dc64
package
com
.
postcard
.
service
.
moudle
.
startObjectExtensionInfo
.
VO
;
import
com.postcard.service.moudle.carrier.vo.CarrierPageVo
;
import
com.postcard.service.moudle.park.vo.ParkPageVo
;
import
lombok.Data
;
import
java.io.Serializable
;
...
...
@@ -31,9 +32,14 @@ public class StarObjectExtensionInfoVO implements Serializable {
private
String
titleIntroduce
;
/**
*
介绍
*
载体列表
*/
private
List
<
CarrierPageVo
>
carrirList
;
/**
* 园区列表
*/
private
List
<
ParkPageVo
>
parkList
;
}
\ No newline at end of file
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