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
d66096c1
Commit
d66096c1
authored
Jan 02, 2024
by
yaobaizheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改类名称
parent
03f749c0
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
241 additions
and
241 deletions
+241
-241
ApiController.java
...va/com/lyy/admin/moudle/api/controller/ApiController.java
+8
-8
DevelopmentInfoController.java
...dle/development/controller/DevelopmentInfoController.java
+4
-4
DevelopmentInfoAuthenticationDto.java
...dle/development/dto/DevelopmentInfoAuthenticationDto.java
+2
-2
DevelopmentInfoCollectionDto.java
.../moudle/development/dto/DevelopmentInfoCollectionDto.java
+2
-3
DevelopmentInfoDto.java
.../lyy/admin/moudle/development/dto/DevelopmentInfoDto.java
+2
-5
DevelopmentInfoMapper.java
...dmin/moudle/development/mapper/DevelopmentInfoMapper.java
+4
-4
DevelopmentInfoService.java
...in/moudle/development/service/DevelopmentInfoService.java
+7
-7
DevelopmentInfoServiceImpl.java
.../development/service/impl/DevelopmentInfoServiceImpl.java
+72
-69
MegalopolisInfoServiceImpl.java
.../megalopolis/service/impl/MegalopolisInfoServiceImpl.java
+4
-4
ParkInfoController.java
.../lyy/admin/moudle/park/controller/ParkInfoController.java
+4
-4
ParkInfoAuthenticationDto.java
.../lyy/admin/moudle/park/dto/ParkInfoAuthenticationDto.java
+2
-2
ParkInfoCollectionDto.java
.../com/lyy/admin/moudle/park/dto/ParkInfoCollectionDto.java
+2
-3
ParkInfoDto.java
src/main/java/com/lyy/admin/moudle/park/dto/ParkInfoDto.java
+2
-3
ParkInfoMapper.java
...java/com/lyy/admin/moudle/park/mapper/ParkInfoMapper.java
+4
-4
ParkInfoService.java
...va/com/lyy/admin/moudle/park/service/ParkInfoService.java
+7
-7
ParkInfoServiceImpl.java
...y/admin/moudle/park/service/impl/ParkInfoServiceImpl.java
+66
-63
PersonalFunctionsController.java
...udle/personal/controller/PersonalFunctionsController.java
+44
-44
application.yml
src/main/resources/application.yml
+1
-1
DevelopmentInfoMapper.xml
...esources/mapper/developmentinfo/DevelopmentInfoMapper.xml
+2
-2
ParkInfoMapper.xml
src/main/resources/mapper/parkinfo/ParkInfoMapper.xml
+2
-2
No files found.
src/main/java/com/lyy/admin/moudle/api/controller/ApiController.java
View file @
d66096c1
...
...
@@ -18,9 +18,9 @@ import com.lyy.admin.moudle.sms.vo.SendPhoneVo;
import
com.lyy.admin.common.page.TableDataInfo
;
import
com.lyy.admin.moudle.other.controller.BaseController
;
import
com.lyy.admin.moudle.development.entity.DevelopmentInfo
;
import
com.lyy.admin.moudle.development.
entity.DevelopmentInfoParam
;
import
com.lyy.admin.moudle.development.
dto.DevelopmentInfoDto
;
import
com.lyy.admin.moudle.park.entity.ParkInfo
;
import
com.lyy.admin.moudle.park.
entity.ParkInfoParam
;
import
com.lyy.admin.moudle.park.
dto.ParkInfoDto
;
import
com.lyy.admin.enumerate.DevelopmentStatusEnum
;
import
com.lyy.admin.enumerate.ExamineStatusEnum
;
import
com.lyy.admin.enumerate.OrganizationEnum
;
...
...
@@ -87,11 +87,11 @@ public class ApiController extends BaseController {
@ApiImplicitParam
(
name
=
"orderByColumn"
,
value
=
"排序字段(可为空,传类属性)"
,
type
=
"String"
),
@ApiImplicitParam
(
name
=
"isAsc"
,
value
=
"排序字段(可为空,请传asc或者desc)"
,
type
=
"String"
)
})
public
TableDataInfo
parkPageList
(
ParkInfo
Param
parkInfoParam
)
{
public
TableDataInfo
parkPageList
(
ParkInfo
Dto
parkInfoDto
)
{
String
status
=
ParkInfoEnum
.
STATUS_YRZ
.
getCode
()+
","
+
ParkInfoEnum
.
STATUS_DRZ
.
getCode
();
parkInfo
Param
.
setStatus
(
status
);
parkInfo
Dto
.
setStatus
(
status
);
startPage
();
List
<
ParkInfo
>
lists
=
parkInfoService
.
selectParkInfoListVO
(
parkInfo
Param
);
List
<
ParkInfo
>
lists
=
parkInfoService
.
selectParkInfoListVO
(
parkInfo
Dto
);
List
<
ParkInfoListVO
>
parkInfoListVOs
=
lists
.
stream
().
map
(
parkInfo
->
{
ParkInfoListVO
parkInfoListVO
=
new
ParkInfoListVO
();
BeanUtils
.
copyProperties
(
parkInfo
,
parkInfoListVO
);
...
...
@@ -120,11 +120,11 @@ public class ApiController extends BaseController {
@ApiImplicitParam
(
name
=
"orderByColumn"
,
value
=
"排序字段(可为空,传类属性)"
,
type
=
"String"
),
@ApiImplicitParam
(
name
=
"isAsc"
,
value
=
"排序字段(可为空,请传asc或者desc)"
,
type
=
"String"
)
})
public
TableDataInfo
developmentPageList
(
DevelopmentInfo
Param
developmentInfoParam
)
{
public
TableDataInfo
developmentPageList
(
DevelopmentInfo
Dto
developmentInfoDto
)
{
String
status
=
DevelopmentStatusEnum
.
STATUS_YRZ
.
getCode
()+
","
+
DevelopmentStatusEnum
.
STATUS_DRZ
.
getCode
();
developmentInfo
Param
.
setStatus
(
status
);
developmentInfo
Dto
.
setStatus
(
status
);
startPage
();
List
<
DevelopmentInfo
>
developmentInfos
=
developmentInfoService
.
selectDevelopmentInfoVOList
(
developmentInfo
Param
);
List
<
DevelopmentInfo
>
developmentInfos
=
developmentInfoService
.
selectDevelopmentInfoVOList
(
developmentInfo
Dto
);
List
<
DevelopmentInfoListVO
>
developmentInfoVOs
=
developmentInfos
.
stream
().
map
(
developmentInfo
->
{
DevelopmentInfoListVO
developmentInfoVO
=
new
DevelopmentInfoListVO
();
BeanUtils
.
copyProperties
(
developmentInfo
,
developmentInfoVO
);
...
...
src/main/java/com/lyy/admin/moudle/development/controller/DevelopmentInfoController.java
View file @
d66096c1
...
...
@@ -10,7 +10,7 @@ import com.lyy.admin.moudle.other.controller.BaseController;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoAllVO
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO
;
import
com.lyy.admin.moudle.development.entity.DevelopmentInfo
;
import
com.lyy.admin.moudle.development.
entity.DevelopmentInfoParam
;
import
com.lyy.admin.moudle.development.
dto.DevelopmentInfoDto
;
import
com.lyy.admin.enumerate.DevelopmentStatusEnum
;
import
com.lyy.admin.moudle.development.service.DevelopmentInfoService
;
import
io.swagger.annotations.Api
;
...
...
@@ -44,12 +44,12 @@ public class DevelopmentInfoController extends BaseController {
@ApiImplicitParam
(
name
=
"isAsc"
,
value
=
"排序字段(可为空,请传asc或者desc)"
,
type
=
"String"
)
})
@EncryptBusiness
public
TableDataInfo
list
(
DevelopmentInfo
Param
developmentInfoParam
)
{
public
TableDataInfo
list
(
DevelopmentInfo
Dto
developmentInfoDto
)
{
boolean
login
=
isLogin
();
String
status
=
DevelopmentStatusEnum
.
STATUS_YRZ
.
getCode
()+
","
+
DevelopmentStatusEnum
.
STATUS_DRZ
.
getCode
();
developmentInfo
Param
.
setStatus
(
status
);
developmentInfo
Dto
.
setStatus
(
status
);
startPage
();
List
<
DevelopmentInfo
>
developmentInfos
=
developmentInfoSerivce
.
selectDevelopmentInfoVOList
(
developmentInfo
Param
);
List
<
DevelopmentInfo
>
developmentInfos
=
developmentInfoSerivce
.
selectDevelopmentInfoVOList
(
developmentInfo
Dto
);
List
<
DevelopmentInfoListVO
>
developmentInfoVOs
=
developmentInfos
.
stream
().
map
(
developmentInfo
->
{
DevelopmentInfoListVO
developmentInfoVO
=
new
DevelopmentInfoListVO
();
BeanUtils
.
copyProperties
(
developmentInfo
,
developmentInfoVO
);
...
...
src/main/java/com/lyy/admin/moudle/development/
entity/DevelopmentInfoAuthenticationParam
.java
→
src/main/java/com/lyy/admin/moudle/development/
dto/DevelopmentInfoAuthenticationDto
.java
View file @
d66096c1
package
com
.
lyy
.
admin
.
moudle
.
development
.
entity
;
package
com
.
lyy
.
admin
.
moudle
.
development
.
dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
...
...
@@ -8,7 +8,7 @@ import java.util.List;
@Data
public
class
DevelopmentInfoAuthentication
Param
implements
Serializable
{
public
class
DevelopmentInfoAuthentication
Dto
implements
Serializable
{
@ApiModelProperty
(
hidden
=
true
)
private
Integer
userId
;
...
...
src/main/java/com/lyy/admin/moudle/development/
entity/DevelopmentInfoCollectionParam
.java
→
src/main/java/com/lyy/admin/moudle/development/
dto/DevelopmentInfoCollectionDto
.java
View file @
d66096c1
package
com
.
lyy
.
admin
.
moudle
.
development
.
entity
;
package
com
.
lyy
.
admin
.
moudle
.
development
.
dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.List
;
@Data
public
class
DevelopmentInfoCollection
Param
implements
Serializable
{
public
class
DevelopmentInfoCollection
Dto
implements
Serializable
{
// /**
// * 开发区名称
...
...
src/main/java/com/lyy/admin/moudle/development/
entity/DevelopmentInfoParam
.java
→
src/main/java/com/lyy/admin/moudle/development/
dto/DevelopmentInfoDto
.java
View file @
d66096c1
package
com
.
lyy
.
admin
.
moudle
.
development
.
entity
;
package
com
.
lyy
.
admin
.
moudle
.
development
.
dto
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.List
;
@Data
public
class
DevelopmentInfo
Param
implements
Serializable
{
public
class
DevelopmentInfo
Dto
implements
Serializable
{
@ApiModelProperty
(
value
=
"主键id传参,支持多个,用英文逗号分割"
)
private
String
id
;
...
...
src/main/java/com/lyy/admin/moudle/development/mapper/DevelopmentInfoMapper.java
View file @
d66096c1
...
...
@@ -3,8 +3,8 @@ package com.lyy.admin.moudle.development.mapper;
import
com.lyy.admin.moudle.development.entity.DevelopmentInfo
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO
;
import
com.lyy.admin.moudle.development.
entity.DevelopmentInfoAuthenticationParam
;
import
com.lyy.admin.moudle.development.
entity.DevelopmentInfoCollectionParam
;
import
com.lyy.admin.moudle.development.
dto.DevelopmentInfoAuthenticationDto
;
import
com.lyy.admin.moudle.development.
dto.DevelopmentInfoCollectionDto
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
...
...
@@ -20,10 +20,10 @@ public interface DevelopmentInfoMapper extends BaseMapper<DevelopmentInfo> {
public
List
<
DevelopmentInfoListVO
>
selectDevelopmentInfoVOList
(
Integer
id
);
public
List
<
DevelopmentInfoListVO
>
selectDevelopmentInfoAuthenticationList
(
@Param
(
"param"
)
DevelopmentInfoAuthentication
Param
developmentInfoAuthenticationParam
);
public
List
<
DevelopmentInfoListVO
>
selectDevelopmentInfoAuthenticationList
(
@Param
(
"param"
)
DevelopmentInfoAuthentication
Dto
developmentInfoAuthenticationDto
);
public
List
<
DevelopmentInfoListVO
>
selectDevelopmentInfoCollectionList
(
DevelopmentInfoCollection
Param
developmentInfoParam
);
public
List
<
DevelopmentInfoListVO
>
selectDevelopmentInfoCollectionList
(
DevelopmentInfoCollection
Dto
developmentInfoParam
);
}
...
...
src/main/java/com/lyy/admin/moudle/development/service/DevelopmentInfoService.java
View file @
d66096c1
...
...
@@ -4,9 +4,9 @@ import com.lyy.admin.moudle.carrier.vo.CarrierInvestmentVo;
import
com.lyy.admin.moudle.development.dto.DevelopmentMapDto
;
import
com.lyy.admin.moudle.development.entity.DevelopmentInfo
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.lyy.admin.moudle.development.
entity.DevelopmentInfoAuthenticationParam
;
import
com.lyy.admin.moudle.development.
entity.DevelopmentInfoCollectionParam
;
import
com.lyy.admin.moudle.development.
entity.DevelopmentInfoParam
;
import
com.lyy.admin.moudle.development.
dto.DevelopmentInfoAuthenticationDto
;
import
com.lyy.admin.moudle.development.
dto.DevelopmentInfoCollectionDto
;
import
com.lyy.admin.moudle.development.
dto.DevelopmentInfoDto
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoAllSaveVO
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoAllVO
;
import
com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO
;
...
...
@@ -20,15 +20,15 @@ import java.util.List;
* @createDate 2023-09-19 17:24:27
*/
public
interface
DevelopmentInfoService
extends
IService
<
DevelopmentInfo
>
{
public
List
<
DevelopmentInfo
>
selectDevelopmentInfoVOList
(
DevelopmentInfo
Param
developmentInfoParam
);
public
List
<
DevelopmentInfo
>
selectDevelopmentInfoVOList
(
DevelopmentInfo
Dto
developmentInfoDto
);
public
List
<
DevelopmentInfo
>
selectDevelopmentInfoDraftList
(
DevelopmentInfo
Param
developmentInfoParam
);
public
List
<
DevelopmentInfo
>
selectDevelopmentInfoDraftList
(
DevelopmentInfo
Dto
developmentInfoDto
);
public
DevelopmentInfoAllVO
getDevelopmentInfo
(
Long
businessId
,
Integer
userId
,
Boolean
isMembership
);
public
List
<
DevelopmentInfoListVO
>
selectDevelopmentInfoCollectionList
(
DevelopmentInfoCollection
Param
developmentInfoParam
);
public
List
<
DevelopmentInfoListVO
>
selectDevelopmentInfoCollectionList
(
DevelopmentInfoCollection
Dto
developmentInfoParam
);
public
List
<
DevelopmentInfoListVO
>
selectDevelopmentInfoAuthenticationList
(
DevelopmentInfoAuthentication
Param
developmentInfoAuthenticationParam
);
public
List
<
DevelopmentInfoListVO
>
selectDevelopmentInfoAuthenticationList
(
DevelopmentInfoAuthentication
Dto
developmentInfoAuthenticationDto
);
public
Boolean
saveDevelopmentInfo
(
DevelopmentInfoAllSaveVO
developmentInfoSaveVO
,
Integer
userId
,
String
userName
);
public
Boolean
updateDevelopmentInfo
(
DevelopmentInfoAllSaveVO
developmentInfoSaveVO
,
Integer
userId
,
String
userName
);
...
...
src/main/java/com/lyy/admin/moudle/development/service/impl/DevelopmentInfoServiceImpl.java
View file @
d66096c1
...
...
@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.lyy.admin.common.utils.BusinessService
;
import
com.lyy.admin.moudle.carrier.vo.CarrierInvestmentVo
;
import
com.lyy.admin.moudle.development.dto.DevelopmentInfoAuthenticationDto
;
import
com.lyy.admin.moudle.development.dto.DevelopmentInfoCollectionDto
;
import
com.lyy.admin.moudle.development.dto.DevelopmentInfoDto
;
import
com.lyy.admin.moudle.development.dto.DevelopmentMapDto
;
import
com.lyy.admin.moudle.development.vo.*
;
import
com.lyy.admin.moudle.other.entity.FileSource
;
...
...
@@ -19,7 +22,7 @@ import com.lyy.admin.moudle.system.entity.SysCollection;
import
com.lyy.admin.moudle.land.entity.LandInfoEntity
;
import
com.lyy.admin.moudle.land.service.DevelopmentIndustrialLandInfoService
;
import
com.lyy.admin.moudle.park.entity.ParkInfo
;
import
com.lyy.admin.moudle.park.
entity.ParkInfoParam
;
import
com.lyy.admin.moudle.park.
dto.ParkInfoDto
;
import
com.lyy.admin.moudle.system.entity.SysCarouselInfo
;
import
com.lyy.admin.moudle.system.mapper.SysCollectionMapper
;
import
com.lyy.admin.moudle.system.mapper.SysMembershipInfoMapper
;
...
...
@@ -94,29 +97,29 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
FileSourceService
fileSourceService
;
@Override
public
List
<
DevelopmentInfo
>
selectDevelopmentInfoVOList
(
DevelopmentInfo
Param
developmentInfoParam
)
{
String
planArea
=
developmentInfo
Param
.
getPlanArea
();
public
List
<
DevelopmentInfo
>
selectDevelopmentInfoVOList
(
DevelopmentInfo
Dto
developmentInfoDto
)
{
String
planArea
=
developmentInfo
Dto
.
getPlanArea
();
if
(
ObjectUtils
.
isNotEmpty
(
planArea
))
{
if
(
planArea
.
contains
(
"-"
))
{
String
[]
split
=
planArea
.
split
(
"-"
);
String
start
=
split
[
0
];
String
end
=
split
[
1
];
developmentInfo
Param
.
setPlanAreaUp
(
Double
.
valueOf
(
start
));
developmentInfo
Param
.
setPlanAreaUnder
(
Double
.
valueOf
(
end
));
developmentInfo
Dto
.
setPlanAreaUp
(
Double
.
valueOf
(
start
));
developmentInfo
Dto
.
setPlanAreaUnder
(
Double
.
valueOf
(
end
));
}
else
if
(
planArea
.
endsWith
(
"+"
))
{
String
substring
=
planArea
.
substring
(
0
,
planArea
.
length
()
-
1
);
developmentInfo
Param
.
setPlanAreaUp
(
Double
.
valueOf
(
substring
));
developmentInfo
Param
.
setPlanAreaUnder
(
Double
.
MAX_VALUE
);
developmentInfo
Dto
.
setPlanAreaUp
(
Double
.
valueOf
(
substring
));
developmentInfo
Dto
.
setPlanAreaUnder
(
Double
.
MAX_VALUE
);
}
}
QueryWrapper
<
DevelopmentInfo
>
developmentInfoQW
=
new
QueryWrapper
();
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Param
.
getPlanAreaUnder
())
&&
ObjectUtils
.
isNotEmpty
(
developmentInfoParam
.
getPlanAreaUp
())){
developmentInfoQW
.
ge
(
"plan_area"
,
developmentInfo
Param
.
getPlanAreaUp
()).
lt
(
"plan_area"
,
developmentInfoParam
.
getPlanAreaUnder
());
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Dto
.
getPlanAreaUnder
())
&&
ObjectUtils
.
isNotEmpty
(
developmentInfoDto
.
getPlanAreaUp
())){
developmentInfoQW
.
ge
(
"plan_area"
,
developmentInfo
Dto
.
getPlanAreaUp
()).
lt
(
"plan_area"
,
developmentInfoDto
.
getPlanAreaUnder
());
}
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Param
.
getId
())){
developmentInfoQW
.
in
(
"id"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
developmentInfo
Param
.
getId
()));
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Dto
.
getId
())){
developmentInfoQW
.
in
(
"id"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
developmentInfo
Dto
.
getId
()));
}
String
name
=
developmentInfo
Param
.
getName
();
String
name
=
developmentInfo
Dto
.
getName
();
if
(
StringUtils
.
isNotBlank
(
name
)){
developmentInfoQW
.
and
(
w
->
w
.
like
(
"name"
,
name
).
or
().
like
(
"description"
,
name
));
}
...
...
@@ -128,11 +131,11 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
// .or().eq("region_code" , developmentInfoParam.getAreaCode())
// );
// }
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Param
.
getAreaName
()))
{
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Dto
.
getAreaName
()))
{
developmentInfoQW
.
and
(
w
->
w
.
eq
(
"city_name"
,
developmentInfo
Param
.
getAreaName
())
.
or
().
eq
(
"region_name"
,
developmentInfo
Param
.
getAreaName
())
.
or
().
eq
(
"province_name"
,
developmentInfo
Param
.
getAreaName
())
w
->
w
.
eq
(
"city_name"
,
developmentInfo
Dto
.
getAreaName
())
.
or
().
eq
(
"region_name"
,
developmentInfo
Dto
.
getAreaName
())
.
or
().
eq
(
"province_name"
,
developmentInfo
Dto
.
getAreaName
())
);
}
// if(StringUtils.isNotBlank(developmentInfoParam.getProvinceCode())){
...
...
@@ -144,30 +147,30 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
// if(StringUtils.isNotBlank(developmentInfoParam.getRegionCode())){
// developmentInfoQW.eq("region_code", developmentInfoParam.getRegionCode());
// }
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Param
.
getPrimaryIndustry
())){
developmentInfoQW
.
like
(
"primary_industry"
,
developmentInfo
Param
.
getPrimaryIndustry
());
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Dto
.
getPrimaryIndustry
())){
developmentInfoQW
.
like
(
"primary_industry"
,
developmentInfo
Dto
.
getPrimaryIndustry
());
}
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Param
.
getLevelCode
())){
developmentInfoQW
.
eq
(
"level_code"
,
developmentInfo
Param
.
getLevelCode
());
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Dto
.
getLevelCode
())){
developmentInfoQW
.
eq
(
"level_code"
,
developmentInfo
Dto
.
getLevelCode
());
}
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Param
.
getLevelName
())){
developmentInfoQW
.
like
(
"level_name"
,
developmentInfo
Param
.
getLevelName
());
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Dto
.
getLevelName
())){
developmentInfoQW
.
like
(
"level_name"
,
developmentInfo
Dto
.
getLevelName
());
}
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Param
.
getType
())){
developmentInfoQW
.
eq
(
"type"
,
developmentInfo
Param
.
getType
());
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Dto
.
getType
())){
developmentInfoQW
.
eq
(
"type"
,
developmentInfo
Dto
.
getType
());
}
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Param
.
getMegalopolisId
())){
developmentInfoQW
.
eq
(
"megalopolis_id"
,
developmentInfo
Param
.
getMegalopolisId
());
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Dto
.
getMegalopolisId
())){
developmentInfoQW
.
eq
(
"megalopolis_id"
,
developmentInfo
Dto
.
getMegalopolisId
());
}
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Param
.
getStatus
())){
developmentInfoQW
.
in
(
"status"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
developmentInfo
Param
.
getStatus
()));
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Dto
.
getStatus
())){
developmentInfoQW
.
in
(
"status"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
developmentInfo
Dto
.
getStatus
()));
}
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Param
.
getUserId
()))
{
developmentInfoQW
.
in
(
"user_id"
,
developmentInfo
Param
.
getUserId
());
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Dto
.
getUserId
()))
{
developmentInfoQW
.
in
(
"user_id"
,
developmentInfo
Dto
.
getUserId
());
}
if
(
StringUtils
.
isNotEmpty
(
developmentInfo
Param
.
getOrganization
()))
{
String
nameByCode
=
OrganizationEnum
.
getNameByCode
(
developmentInfo
Param
.
getOrganization
());
if
(
developmentInfo
Param
.
getOrganization
().
equals
(
OrganizationEnum
.
SCF
.
getCode
())){
if
(
StringUtils
.
isNotEmpty
(
developmentInfo
Dto
.
getOrganization
()))
{
String
nameByCode
=
OrganizationEnum
.
getNameByCode
(
developmentInfo
Dto
.
getOrganization
());
if
(
developmentInfo
Dto
.
getOrganization
().
equals
(
OrganizationEnum
.
SCF
.
getCode
())){
developmentInfoQW
.
in
(
"organization"
,
nameByCode
.
split
(
";"
));
}
}
...
...
@@ -179,59 +182,59 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
@Override
public
List
<
DevelopmentInfo
>
selectDevelopmentInfoDraftList
(
DevelopmentInfo
Param
developmentInfoParam
)
{
String
planArea
=
developmentInfo
Param
.
getPlanArea
();
public
List
<
DevelopmentInfo
>
selectDevelopmentInfoDraftList
(
DevelopmentInfo
Dto
developmentInfoDto
)
{
String
planArea
=
developmentInfo
Dto
.
getPlanArea
();
if
(
ObjectUtils
.
isNotEmpty
(
planArea
))
{
if
(
planArea
.
contains
(
"-"
))
{
String
[]
split
=
planArea
.
split
(
"-"
);
String
start
=
split
[
0
];
String
end
=
split
[
1
];
developmentInfo
Param
.
setPlanAreaUp
(
Double
.
valueOf
(
start
));
developmentInfo
Param
.
setPlanAreaUnder
(
Double
.
valueOf
(
end
));
developmentInfo
Dto
.
setPlanAreaUp
(
Double
.
valueOf
(
start
));
developmentInfo
Dto
.
setPlanAreaUnder
(
Double
.
valueOf
(
end
));
}
else
if
(
planArea
.
endsWith
(
"+"
))
{
String
substring
=
planArea
.
substring
(
0
,
planArea
.
length
()
-
1
);
developmentInfo
Param
.
setPlanAreaUp
(
Double
.
valueOf
(
substring
));
developmentInfo
Param
.
setPlanAreaUnder
(
Double
.
MAX_VALUE
);
developmentInfo
Dto
.
setPlanAreaUp
(
Double
.
valueOf
(
substring
));
developmentInfo
Dto
.
setPlanAreaUnder
(
Double
.
MAX_VALUE
);
}
}
QueryWrapper
<
DevelopmentInfo
>
developmentInfoQW
=
new
QueryWrapper
();
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Param
.
getPlanAreaUnder
())
&&
ObjectUtils
.
isNotEmpty
(
developmentInfoParam
.
getPlanAreaUp
())){
developmentInfoQW
.
ge
(
"plan_area"
,
developmentInfo
Param
.
getPlanAreaUp
()).
lt
(
"plan_area"
,
developmentInfoParam
.
getPlanAreaUnder
());
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Dto
.
getPlanAreaUnder
())
&&
ObjectUtils
.
isNotEmpty
(
developmentInfoDto
.
getPlanAreaUp
())){
developmentInfoQW
.
ge
(
"plan_area"
,
developmentInfo
Dto
.
getPlanAreaUp
()).
lt
(
"plan_area"
,
developmentInfoDto
.
getPlanAreaUnder
());
}
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Param
.
getId
())){
developmentInfoQW
.
in
(
"id"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
developmentInfo
Param
.
getId
()));
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Dto
.
getId
())){
developmentInfoQW
.
in
(
"id"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
developmentInfo
Dto
.
getId
()));
}
String
name
=
developmentInfo
Param
.
getName
();
String
name
=
developmentInfo
Dto
.
getName
();
if
(
StringUtils
.
isNotBlank
(
name
)){
developmentInfoQW
.
and
(
w
->
w
.
like
(
"name"
,
name
).
or
().
like
(
"description"
,
name
));
}
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Param
.
getAreaName
()))
{
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Dto
.
getAreaName
()))
{
developmentInfoQW
.
and
(
w
->
w
.
eq
(
"city_name"
,
developmentInfo
Param
.
getAreaName
())
.
or
().
eq
(
"region_name"
,
developmentInfo
Param
.
getAreaName
())
.
or
().
eq
(
"province_name"
,
developmentInfo
Param
.
getAreaName
())
w
->
w
.
eq
(
"city_name"
,
developmentInfo
Dto
.
getAreaName
())
.
or
().
eq
(
"region_name"
,
developmentInfo
Dto
.
getAreaName
())
.
or
().
eq
(
"province_name"
,
developmentInfo
Dto
.
getAreaName
())
);
}
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Param
.
getPrimaryIndustry
())){
developmentInfoQW
.
like
(
"primary_industry"
,
developmentInfo
Param
.
getPrimaryIndustry
());
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Dto
.
getPrimaryIndustry
())){
developmentInfoQW
.
like
(
"primary_industry"
,
developmentInfo
Dto
.
getPrimaryIndustry
());
}
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Param
.
getLevelCode
())){
developmentInfoQW
.
eq
(
"level_code"
,
developmentInfo
Param
.
getLevelCode
());
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Dto
.
getLevelCode
())){
developmentInfoQW
.
eq
(
"level_code"
,
developmentInfo
Dto
.
getLevelCode
());
}
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Param
.
getLevelName
())){
developmentInfoQW
.
like
(
"level_name"
,
developmentInfo
Param
.
getLevelName
());
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Dto
.
getLevelName
())){
developmentInfoQW
.
like
(
"level_name"
,
developmentInfo
Dto
.
getLevelName
());
}
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Param
.
getType
())){
developmentInfoQW
.
eq
(
"type"
,
developmentInfo
Param
.
getType
());
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Dto
.
getType
())){
developmentInfoQW
.
eq
(
"type"
,
developmentInfo
Dto
.
getType
());
}
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Param
.
getMegalopolisId
())){
developmentInfoQW
.
eq
(
"megalopolis_id"
,
developmentInfo
Param
.
getMegalopolisId
());
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Dto
.
getMegalopolisId
())){
developmentInfoQW
.
eq
(
"megalopolis_id"
,
developmentInfo
Dto
.
getMegalopolisId
());
}
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Param
.
getStatus
())){
developmentInfoQW
.
in
(
"status"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
developmentInfo
Param
.
getStatus
()));
if
(
StringUtils
.
isNotBlank
(
developmentInfo
Dto
.
getStatus
())){
developmentInfoQW
.
in
(
"status"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
developmentInfo
Dto
.
getStatus
()));
}
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Param
.
getUserId
()))
{
developmentInfoQW
.
in
(
"user_id"
,
developmentInfo
Param
.
getUserId
());
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfo
Dto
.
getUserId
()))
{
developmentInfoQW
.
in
(
"user_id"
,
developmentInfo
Dto
.
getUserId
());
}
developmentInfoQW
.
orderByDesc
(
"update_time"
);
...
...
@@ -328,10 +331,10 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
List
<
LandInfoEntity
>
developmentIndustrialLandInfoList
=
developmentIndustrialLandInfoService
.
list
(
developmentIndustrialLandInfoQW
);
//所属园区信息
ParkInfo
Param
parkInfoParam
=
new
ParkInfoParam
();
parkInfo
Param
.
setZoneId
(
id
);
parkInfo
Param
.
setStatus
(
ParkInfoEnum
.
STATUS_YRZ
.
getCode
()+
","
+
ParkInfoEnum
.
STATUS_DRZ
.
getCode
());
List
<
ParkInfo
>
lists
=
parkInfoService
.
selectParkInfoListVO
(
parkInfo
Param
);
ParkInfo
Dto
parkInfoDto
=
new
ParkInfoDto
();
parkInfo
Dto
.
setZoneId
(
id
);
parkInfo
Dto
.
setStatus
(
ParkInfoEnum
.
STATUS_YRZ
.
getCode
()+
","
+
ParkInfoEnum
.
STATUS_DRZ
.
getCode
());
List
<
ParkInfo
>
lists
=
parkInfoService
.
selectParkInfoListVO
(
parkInfo
Dto
);
List
<
ParkInfoListVO
>
parkInfoListVOS
=
lists
.
stream
().
map
(
parkInfo
->
{
ParkInfoListVO
parkInfoListVO
=
new
ParkInfoListVO
();
BeanUtils
.
copyProperties
(
parkInfo
,
parkInfoListVO
);
...
...
@@ -397,7 +400,7 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
}
@Override
public
List
<
DevelopmentInfoListVO
>
selectDevelopmentInfoCollectionList
(
DevelopmentInfoCollection
Param
developmentInfoParam
)
{
public
List
<
DevelopmentInfoListVO
>
selectDevelopmentInfoCollectionList
(
DevelopmentInfoCollection
Dto
developmentInfoParam
)
{
return
developmentInfoMapper
.
selectDevelopmentInfoCollectionList
(
developmentInfoParam
);
}
...
...
@@ -652,8 +655,8 @@ public class DevelopmentInfoServiceImpl extends ServiceImpl<DevelopmentInfoMappe
}
public
List
<
DevelopmentInfoListVO
>
selectDevelopmentInfoAuthenticationList
(
DevelopmentInfoAuthentication
Param
developmentInfoAuthenticationParam
){
return
developmentInfoMapper
.
selectDevelopmentInfoAuthenticationList
(
developmentInfoAuthentication
Param
);
public
List
<
DevelopmentInfoListVO
>
selectDevelopmentInfoAuthenticationList
(
DevelopmentInfoAuthentication
Dto
developmentInfoAuthenticationDto
){
return
developmentInfoMapper
.
selectDevelopmentInfoAuthenticationList
(
developmentInfoAuthentication
Dto
);
}
...
...
src/main/java/com/lyy/admin/moudle/megalopolis/service/impl/MegalopolisInfoServiceImpl.java
View file @
d66096c1
...
...
@@ -14,7 +14,7 @@ import com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO;
import
com.lyy.admin.moudle.megalopolis.entity.MegalopolisCoreCityInfo
;
import
com.lyy.admin.moudle.system.entity.SysCollection
;
import
com.lyy.admin.moudle.development.entity.DevelopmentInfo
;
import
com.lyy.admin.moudle.development.
entity.DevelopmentInfoParam
;
import
com.lyy.admin.moudle.development.
dto.DevelopmentInfoDto
;
import
com.lyy.admin.moudle.system.entity.SysCarouselInfo
;
import
com.lyy.admin.moudle.megalopolis.mapper.MegalopolisCoreCityInfoMapper
;
import
com.lyy.admin.moudle.megalopolis.mapper.MegalopolisIndustryInfoMapper
;
...
...
@@ -134,9 +134,9 @@ public class MegalopolisInfoServiceImpl extends ServiceImpl<MegalopolisInfoMappe
BeanUtils
.
copyProperties
(
megalopolisInfo
,
megalopolisInfoVO
);
//开发区信息
DevelopmentInfo
Param
developmentInfoParam
=
new
DevelopmentInfoParam
();
developmentInfo
Param
.
setMegalopolisId
(
id
);
List
<
DevelopmentInfo
>
developmentInfos
=
developmentInfoService
.
selectDevelopmentInfoVOList
(
developmentInfo
Param
);
DevelopmentInfo
Dto
developmentInfoDto
=
new
DevelopmentInfoDto
();
developmentInfo
Dto
.
setMegalopolisId
(
id
);
List
<
DevelopmentInfo
>
developmentInfos
=
developmentInfoService
.
selectDevelopmentInfoVOList
(
developmentInfo
Dto
);
List
<
DevelopmentInfoListVO
>
developmentInfoVOs
=
developmentInfos
.
stream
().
map
(
developmentInfo
->
{
DevelopmentInfoListVO
developmentInfoVO
=
new
DevelopmentInfoListVO
();
BeanUtils
.
copyProperties
(
developmentInfo
,
developmentInfoVO
);
...
...
src/main/java/com/lyy/admin/moudle/park/controller/ParkInfoController.java
View file @
d66096c1
...
...
@@ -9,7 +9,7 @@ import com.lyy.admin.common.page.TableDataInfo;
import
com.lyy.admin.moudle.other.controller.BaseController
;
import
com.lyy.admin.enumerate.ParkInfoEnum
;
import
com.lyy.admin.moudle.park.entity.ParkInfo
;
import
com.lyy.admin.moudle.park.
entity.ParkInfoParam
;
import
com.lyy.admin.moudle.park.
dto.ParkInfoDto
;
import
com.lyy.admin.moudle.park.service.ParkInfoService
;
import
com.lyy.admin.moudle.system.service.SysCollectionService
;
import
io.swagger.annotations.Api
;
...
...
@@ -47,12 +47,12 @@ public class ParkInfoController extends BaseController {
@ApiImplicitParam
(
name
=
"isAsc"
,
value
=
"排序字段(可为空,请传asc或者desc)"
,
type
=
"String"
)
})
@EncryptBusiness
public
TableDataInfo
list
(
ParkInfo
Param
parkInfoParam
)
{
public
TableDataInfo
list
(
ParkInfo
Dto
parkInfoDto
)
{
boolean
login
=
isLogin
();
String
status
=
ParkInfoEnum
.
STATUS_YRZ
.
getCode
()+
","
+
ParkInfoEnum
.
STATUS_DRZ
.
getCode
();
parkInfo
Param
.
setStatus
(
status
);
parkInfo
Dto
.
setStatus
(
status
);
startPage
();
List
<
ParkInfo
>
lists
=
parkInfoService
.
selectParkInfoListVO
(
parkInfo
Param
);
List
<
ParkInfo
>
lists
=
parkInfoService
.
selectParkInfoListVO
(
parkInfo
Dto
);
List
<
ParkInfoListVO
>
parkInfoListVOs
=
lists
.
stream
().
map
(
parkInfo
->
{
ParkInfoListVO
parkInfoListVO
=
new
ParkInfoListVO
();
BeanUtils
.
copyProperties
(
parkInfo
,
parkInfoListVO
);
...
...
src/main/java/com/lyy/admin/moudle/park/
entity/ParkInfoAuthenticationParam
.java
→
src/main/java/com/lyy/admin/moudle/park/
dto/ParkInfoAuthenticationDto
.java
View file @
d66096c1
package
com
.
lyy
.
admin
.
moudle
.
park
.
entity
;
package
com
.
lyy
.
admin
.
moudle
.
park
.
dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
...
...
@@ -8,7 +8,7 @@ import java.util.List;
@Data
public
class
ParkInfoAuthentication
Param
implements
Serializable
{
public
class
ParkInfoAuthentication
Dto
implements
Serializable
{
@ApiModelProperty
(
hidden
=
true
)
private
Integer
userId
;
...
...
src/main/java/com/lyy/admin/moudle/park/
entity/ParkInfoCollectionParam
.java
→
src/main/java/com/lyy/admin/moudle/park/
dto/ParkInfoCollectionDto
.java
View file @
d66096c1
package
com
.
lyy
.
admin
.
moudle
.
park
.
entity
;
package
com
.
lyy
.
admin
.
moudle
.
park
.
dto
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.List
;
@Data
public
class
ParkInfoCollection
Param
implements
Serializable
{
public
class
ParkInfoCollection
Dto
implements
Serializable
{
...
...
src/main/java/com/lyy/admin/moudle/park/
entity/ParkInfoParam
.java
→
src/main/java/com/lyy/admin/moudle/park/
dto/ParkInfoDto
.java
View file @
d66096c1
package
com
.
lyy
.
admin
.
moudle
.
park
.
entity
;
package
com
.
lyy
.
admin
.
moudle
.
park
.
dto
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
...
...
@@ -6,11 +6,10 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.List
;
@Data
public
class
ParkInfo
Param
implements
Serializable
{
public
class
ParkInfo
Dto
implements
Serializable
{
/**
...
...
src/main/java/com/lyy/admin/moudle/park/mapper/ParkInfoMapper.java
View file @
d66096c1
...
...
@@ -3,8 +3,8 @@ package com.lyy.admin.moudle.park.mapper;
import
com.lyy.admin.moudle.park.entity.ParkInfo
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.lyy.admin.moudle.park.vo.ParkInfoListVO
;
import
com.lyy.admin.moudle.park.
entity.ParkInfoAuthenticationParam
;
import
com.lyy.admin.moudle.park.
entity.ParkInfoCollectionParam
;
import
com.lyy.admin.moudle.park.
dto.ParkInfoAuthenticationDto
;
import
com.lyy.admin.moudle.park.
dto.ParkInfoCollectionDto
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
...
...
@@ -21,8 +21,8 @@ public interface ParkInfoMapper extends BaseMapper<ParkInfo> {
public
List
<
ParkInfoListVO
>
selectParkInfoVOByIdList
(
Integer
id
);
public
List
<
ParkInfoListVO
>
selectParkInfoAuthenticationList
(
@Param
(
"param"
)
ParkInfoAuthentication
Param
parkInfoAuthenticationParam
);
public
List
<
ParkInfoListVO
>
selectParkInfoCollectionList
(
ParkInfoCollection
Param
parkInfoParam
);
public
List
<
ParkInfoListVO
>
selectParkInfoAuthenticationList
(
@Param
(
"param"
)
ParkInfoAuthentication
Dto
parkInfoAuthenticationDto
);
public
List
<
ParkInfoListVO
>
selectParkInfoCollectionList
(
ParkInfoCollection
Dto
parkInfoParam
);
}
...
...
src/main/java/com/lyy/admin/moudle/park/service/ParkInfoService.java
View file @
d66096c1
...
...
@@ -6,9 +6,9 @@ import com.lyy.admin.moudle.park.vo.ParkInfoAllVO;
import
com.lyy.admin.moudle.park.vo.ParkInfoListVO
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.lyy.admin.moudle.park.entity.ParkInfo
;
import
com.lyy.admin.moudle.park.
entity.ParkInfoAuthenticationParam
;
import
com.lyy.admin.moudle.park.
entity.ParkInfoCollectionParam
;
import
com.lyy.admin.moudle.park.
entity.ParkInfoParam
;
import
com.lyy.admin.moudle.park.
dto.ParkInfoAuthenticationDto
;
import
com.lyy.admin.moudle.park.
dto.ParkInfoCollectionDto
;
import
com.lyy.admin.moudle.park.
dto.ParkInfoDto
;
import
java.util.List
;
...
...
@@ -18,12 +18,12 @@ import java.util.List;
* @createDate 2023-09-08 11:31:50
*/
public
interface
ParkInfoService
extends
IService
<
ParkInfo
>
{
public
List
<
ParkInfo
>
selectParkInfoListVO
(
ParkInfo
Param
parkInfoParam
);
public
List
<
ParkInfo
>
selectParkInfoDraftListVO
(
ParkInfo
Param
parkInfoParam
);
public
List
<
ParkInfo
>
selectParkInfoListVO
(
ParkInfo
Dto
parkInfoDto
);
public
List
<
ParkInfo
>
selectParkInfoDraftListVO
(
ParkInfo
Dto
parkInfoDto
);
public
List
<
ParkInfo
>
selectHotParkInfoListVO
();
public
ParkInfoAllVO
getParkInfo
(
Long
businessId
,
Integer
userId
,
Boolean
isMemberShip
);
public
List
<
ParkInfoListVO
>
selectParkInfoAuthenticationList
(
ParkInfoAuthentication
Param
parkInfoAuthenticationParam
);
public
List
<
ParkInfoListVO
>
selectParkInfoCollectionList
(
ParkInfoCollection
Param
parkInfoParam
);
public
List
<
ParkInfoListVO
>
selectParkInfoAuthenticationList
(
ParkInfoAuthentication
Dto
parkInfoAuthenticationDto
);
public
List
<
ParkInfoListVO
>
selectParkInfoCollectionList
(
ParkInfoCollection
Dto
parkInfoParam
);
public
Boolean
saveParkInfo
(
ParkInfoAllSaveVO
parkInfoAllVO
,
Integer
userId
,
String
userName
);
public
Boolean
updateParkInfo
(
ParkInfoAllSaveVO
parkInfoAllVO
,
Integer
userId
,
String
userName
);
public
Boolean
isExistInfo
(
Integer
userId
,
Integer
collectionId
);
...
...
src/main/java/com/lyy/admin/moudle/park/service/impl/ParkInfoServiceImpl.java
View file @
d66096c1
...
...
@@ -16,6 +16,9 @@ import com.lyy.admin.enumerate.*;
import
com.lyy.admin.common.exception.APIException
;
import
com.lyy.admin.common.exception.APIExceptionEnum
;
import
com.lyy.admin.moudle.other.vo.FileSourceVO
;
import
com.lyy.admin.moudle.park.dto.ParkInfoAuthenticationDto
;
import
com.lyy.admin.moudle.park.dto.ParkInfoCollectionDto
;
import
com.lyy.admin.moudle.park.dto.ParkInfoDto
;
import
com.lyy.admin.moudle.park.vo.*
;
import
com.lyy.admin.moudle.system.entity.SysCollection
;
import
com.lyy.admin.moudle.system.entity.SysCarouselInfo
;
...
...
@@ -122,32 +125,32 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
FileSourceService
fileSourceService
;
// @Cache(cacheByUser = false)
public
List
<
ParkInfo
>
selectParkInfoListVO
(
ParkInfo
Param
parkInfoParam
)
{
String
coverArea
=
parkInfo
Param
.
getCoverArea
();
public
List
<
ParkInfo
>
selectParkInfoListVO
(
ParkInfo
Dto
parkInfoDto
)
{
String
coverArea
=
parkInfo
Dto
.
getCoverArea
();
if
(
ObjectUtils
.
isNotEmpty
(
coverArea
))
{
if
(
coverArea
.
contains
(
"-"
))
{
String
[]
split
=
coverArea
.
split
(
"-"
);
String
start
=
split
[
0
];
String
end
=
split
[
1
];
parkInfo
Param
.
setCoverAreaUp
(
Double
.
valueOf
(
start
));
parkInfo
Param
.
setCoverAreaUnder
(
Double
.
valueOf
(
end
));
parkInfo
Dto
.
setCoverAreaUp
(
Double
.
valueOf
(
start
));
parkInfo
Dto
.
setCoverAreaUnder
(
Double
.
valueOf
(
end
));
}
else
if
(
coverArea
.
endsWith
(
"+"
))
{
String
substring
=
coverArea
.
substring
(
0
,
coverArea
.
length
()
-
1
);
parkInfo
Param
.
setCoverAreaUp
(
Double
.
valueOf
(
substring
));
parkInfo
Param
.
setCoverAreaUnder
(
Double
.
MAX_VALUE
);
parkInfo
Dto
.
setCoverAreaUp
(
Double
.
valueOf
(
substring
));
parkInfo
Dto
.
setCoverAreaUnder
(
Double
.
MAX_VALUE
);
}
}
QueryWrapper
<
ParkInfo
>
ParkInfoQW
=
new
QueryWrapper
<>();
Double
coverAreaUp
=
parkInfo
Param
.
getCoverAreaUp
();
Double
coverAreaUnder
=
parkInfo
Param
.
getCoverAreaUnder
();
Double
coverAreaUp
=
parkInfo
Dto
.
getCoverAreaUp
();
Double
coverAreaUnder
=
parkInfo
Dto
.
getCoverAreaUnder
();
if
(
ObjectUtils
.
isNotEmpty
(
coverAreaUp
)
&&
ObjectUtils
.
isNotEmpty
(
coverAreaUnder
))
{
ParkInfoQW
.
ge
(
"cover_area"
,
coverAreaUp
).
lt
(
"cover_area"
,
coverAreaUnder
);
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getId
()))
{
ParkInfoQW
.
in
(
"id"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
parkInfo
Param
.
getId
()));
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getId
()))
{
ParkInfoQW
.
in
(
"id"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
parkInfo
Dto
.
getId
()));
}
String
name
=
parkInfo
Param
.
getName
();
String
name
=
parkInfo
Dto
.
getName
();
if
(
StringUtils
.
isNotBlank
(
name
))
{
ParkInfoQW
.
and
(
w
->
w
.
like
(
"name"
,
name
).
or
().
like
(
"description"
,
name
));
}
...
...
@@ -158,39 +161,39 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
// .or().eq("region_code" , parkInfoParam.getAreaCode())
// );
// }
if
(
StringUtils
.
isNotBlank
(
parkInfo
Param
.
getAreaName
()))
{
if
(
StringUtils
.
isNotBlank
(
parkInfo
Dto
.
getAreaName
()))
{
ParkInfoQW
.
and
(
w
->
w
.
eq
(
"city_name"
,
parkInfo
Param
.
getAreaName
())
.
or
().
eq
(
"region_name"
,
parkInfo
Param
.
getAreaName
())
.
or
().
eq
(
"province_name"
,
parkInfo
Param
.
getAreaName
())
w
->
w
.
eq
(
"city_name"
,
parkInfo
Dto
.
getAreaName
())
.
or
().
eq
(
"region_name"
,
parkInfo
Dto
.
getAreaName
())
.
or
().
eq
(
"province_name"
,
parkInfo
Dto
.
getAreaName
())
);
}
if
(
StringUtils
.
isNotBlank
(
parkInfo
Param
.
getPrimaryIndustry
()))
{
ParkInfoQW
.
like
(
"primary_industry"
,
parkInfo
Param
.
getPrimaryIndustry
());
if
(
StringUtils
.
isNotBlank
(
parkInfo
Dto
.
getPrimaryIndustry
()))
{
ParkInfoQW
.
like
(
"primary_industry"
,
parkInfo
Dto
.
getPrimaryIndustry
());
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getIsSystem
()))
{
ParkInfoQW
.
eq
(
"is_system"
,
parkInfo
Param
.
getIsSystem
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getIsSystem
()))
{
ParkInfoQW
.
eq
(
"is_system"
,
parkInfo
Dto
.
getIsSystem
());
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getIsHotPark
()))
{
ParkInfoQW
.
eq
(
"is_hot_park"
,
parkInfo
Param
.
getIsHotPark
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getIsHotPark
()))
{
ParkInfoQW
.
eq
(
"is_hot_park"
,
parkInfo
Dto
.
getIsHotPark
());
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getStatus
()))
{
ParkInfoQW
.
in
(
"status"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
parkInfo
Param
.
getStatus
()));
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getStatus
()))
{
ParkInfoQW
.
in
(
"status"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
parkInfo
Dto
.
getStatus
()));
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getUserId
()))
{
ParkInfoQW
.
in
(
"user_id"
,
parkInfo
Param
.
getUserId
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getUserId
()))
{
ParkInfoQW
.
in
(
"user_id"
,
parkInfo
Dto
.
getUserId
());
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getLevelName
()))
{
ParkInfoQW
.
like
(
"level_name"
,
parkInfo
Param
.
getLevelName
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getLevelName
()))
{
ParkInfoQW
.
like
(
"level_name"
,
parkInfo
Dto
.
getLevelName
());
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getZoneId
()))
{
ParkInfoQW
.
eq
(
"zone_id"
,
parkInfo
Param
.
getZoneId
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getZoneId
()))
{
ParkInfoQW
.
eq
(
"zone_id"
,
parkInfo
Dto
.
getZoneId
());
}
if
(
StringUtils
.
isNotEmpty
(
parkInfo
Param
.
getOrganization
()))
{
String
nameByCode
=
OrganizationEnum
.
getNameByCode
(
parkInfo
Param
.
getOrganization
());
if
(
parkInfo
Param
.
getOrganization
().
equals
(
OrganizationEnum
.
SCF
.
getCode
())){
if
(
StringUtils
.
isNotEmpty
(
parkInfo
Dto
.
getOrganization
()))
{
String
nameByCode
=
OrganizationEnum
.
getNameByCode
(
parkInfo
Dto
.
getOrganization
());
if
(
parkInfo
Dto
.
getOrganization
().
equals
(
OrganizationEnum
.
SCF
.
getCode
())){
ParkInfoQW
.
in
(
"organization"
,
nameByCode
.
split
(
";"
));
}
}
...
...
@@ -202,64 +205,64 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
}
public
List
<
ParkInfo
>
selectParkInfoDraftListVO
(
ParkInfo
Param
parkInfoParam
)
{
String
coverArea
=
parkInfo
Param
.
getCoverArea
();
public
List
<
ParkInfo
>
selectParkInfoDraftListVO
(
ParkInfo
Dto
parkInfoDto
)
{
String
coverArea
=
parkInfo
Dto
.
getCoverArea
();
if
(
ObjectUtils
.
isNotEmpty
(
coverArea
))
{
if
(
coverArea
.
contains
(
"-"
))
{
String
[]
split
=
coverArea
.
split
(
"-"
);
String
start
=
split
[
0
];
String
end
=
split
[
1
];
parkInfo
Param
.
setCoverAreaUp
(
Double
.
valueOf
(
start
));
parkInfo
Param
.
setCoverAreaUnder
(
Double
.
valueOf
(
end
));
parkInfo
Dto
.
setCoverAreaUp
(
Double
.
valueOf
(
start
));
parkInfo
Dto
.
setCoverAreaUnder
(
Double
.
valueOf
(
end
));
}
else
if
(
coverArea
.
endsWith
(
"+"
))
{
String
substring
=
coverArea
.
substring
(
0
,
coverArea
.
length
()
-
1
);
parkInfo
Param
.
setCoverAreaUp
(
Double
.
valueOf
(
substring
));
parkInfo
Param
.
setCoverAreaUnder
(
Double
.
MAX_VALUE
);
parkInfo
Dto
.
setCoverAreaUp
(
Double
.
valueOf
(
substring
));
parkInfo
Dto
.
setCoverAreaUnder
(
Double
.
MAX_VALUE
);
}
}
QueryWrapper
<
ParkInfo
>
ParkInfoQW
=
new
QueryWrapper
<>();
Double
coverAreaUp
=
parkInfo
Param
.
getCoverAreaUp
();
Double
coverAreaUnder
=
parkInfo
Param
.
getCoverAreaUnder
();
Double
coverAreaUp
=
parkInfo
Dto
.
getCoverAreaUp
();
Double
coverAreaUnder
=
parkInfo
Dto
.
getCoverAreaUnder
();
if
(
ObjectUtils
.
isNotEmpty
(
coverAreaUp
)
&&
ObjectUtils
.
isNotEmpty
(
coverAreaUnder
))
{
ParkInfoQW
.
ge
(
"cover_area"
,
coverAreaUp
).
lt
(
"cover_area"
,
coverAreaUnder
);
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getId
()))
{
ParkInfoQW
.
in
(
"id"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
parkInfo
Param
.
getId
()));
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getId
()))
{
ParkInfoQW
.
in
(
"id"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
parkInfo
Dto
.
getId
()));
}
String
name
=
parkInfo
Param
.
getName
();
String
name
=
parkInfo
Dto
.
getName
();
if
(
StringUtils
.
isNotBlank
(
name
))
{
ParkInfoQW
.
and
(
w
->
w
.
like
(
"name"
,
name
).
or
().
like
(
"description"
,
name
));
}
if
(
StringUtils
.
isNotBlank
(
parkInfo
Param
.
getAreaName
()))
{
if
(
StringUtils
.
isNotBlank
(
parkInfo
Dto
.
getAreaName
()))
{
ParkInfoQW
.
and
(
w
->
w
.
eq
(
"city_name"
,
parkInfo
Param
.
getAreaName
())
.
or
().
eq
(
"region_name"
,
parkInfo
Param
.
getAreaName
())
.
or
().
eq
(
"province_name"
,
parkInfo
Param
.
getAreaName
())
w
->
w
.
eq
(
"city_name"
,
parkInfo
Dto
.
getAreaName
())
.
or
().
eq
(
"region_name"
,
parkInfo
Dto
.
getAreaName
())
.
or
().
eq
(
"province_name"
,
parkInfo
Dto
.
getAreaName
())
);
}
if
(
StringUtils
.
isNotBlank
(
parkInfo
Param
.
getPrimaryIndustry
()))
{
ParkInfoQW
.
like
(
"primary_industry"
,
parkInfo
Param
.
getPrimaryIndustry
());
if
(
StringUtils
.
isNotBlank
(
parkInfo
Dto
.
getPrimaryIndustry
()))
{
ParkInfoQW
.
like
(
"primary_industry"
,
parkInfo
Dto
.
getPrimaryIndustry
());
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getIsSystem
()))
{
ParkInfoQW
.
eq
(
"is_system"
,
parkInfo
Param
.
getIsSystem
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getIsSystem
()))
{
ParkInfoQW
.
eq
(
"is_system"
,
parkInfo
Dto
.
getIsSystem
());
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getIsHotPark
()))
{
ParkInfoQW
.
eq
(
"is_hot_park"
,
parkInfo
Param
.
getIsHotPark
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getIsHotPark
()))
{
ParkInfoQW
.
eq
(
"is_hot_park"
,
parkInfo
Dto
.
getIsHotPark
());
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getStatus
()))
{
ParkInfoQW
.
in
(
"status"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
parkInfo
Param
.
getStatus
()));
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getStatus
()))
{
ParkInfoQW
.
in
(
"status"
,
com
.
lyy
.
admin
.
common
.
utils
.
StringUtils
.
typeList
(
parkInfo
Dto
.
getStatus
()));
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getUserId
()))
{
ParkInfoQW
.
in
(
"user_id"
,
parkInfo
Param
.
getUserId
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getUserId
()))
{
ParkInfoQW
.
in
(
"user_id"
,
parkInfo
Dto
.
getUserId
());
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getLevelName
()))
{
ParkInfoQW
.
like
(
"level_name"
,
parkInfo
Param
.
getLevelName
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getLevelName
()))
{
ParkInfoQW
.
like
(
"level_name"
,
parkInfo
Dto
.
getLevelName
());
}
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Param
.
getZoneId
()))
{
ParkInfoQW
.
eq
(
"zone_id"
,
parkInfo
Param
.
getZoneId
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfo
Dto
.
getZoneId
()))
{
ParkInfoQW
.
eq
(
"zone_id"
,
parkInfo
Dto
.
getZoneId
());
}
ParkInfoQW
.
orderByDesc
(
"update_time"
);
...
...
@@ -406,13 +409,13 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
}
@Override
public
List
<
ParkInfoListVO
>
selectParkInfoAuthenticationList
(
ParkInfoAuthentication
Param
arkInfoAuthenticationParam
)
{
public
List
<
ParkInfoListVO
>
selectParkInfoAuthenticationList
(
ParkInfoAuthentication
Dto
arkInfoAuthenticationParam
)
{
List
<
ParkInfoListVO
>
parkInfoVOs
=
parkInfoMapper
.
selectParkInfoAuthenticationList
(
arkInfoAuthenticationParam
);
return
parkInfoVOs
;
}
@Override
public
List
<
ParkInfoListVO
>
selectParkInfoCollectionList
(
ParkInfoCollection
Param
parkInfoParam
)
{
public
List
<
ParkInfoListVO
>
selectParkInfoCollectionList
(
ParkInfoCollection
Dto
parkInfoParam
)
{
List
<
ParkInfoListVO
>
parkInfoVOs
=
parkInfoMapper
.
selectParkInfoCollectionList
(
parkInfoParam
);
return
parkInfoVOs
;
}
...
...
src/main/java/com/lyy/admin/moudle/personal/controller/PersonalFunctionsController.java
View file @
d66096c1
...
...
@@ -10,14 +10,14 @@ import com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO;
import
com.lyy.admin.moudle.megalopolis.vo.MegalopolisInfoListVO
;
import
com.lyy.admin.moudle.other.controller.BaseController
;
import
com.lyy.admin.moudle.development.entity.DevelopmentInfo
;
import
com.lyy.admin.moudle.development.
entity.DevelopmentInfoAuthenticationParam
;
import
com.lyy.admin.moudle.development.
entity.DevelopmentInfoCollectionParam
;
import
com.lyy.admin.moudle.development.
entity.DevelopmentInfoParam
;
import
com.lyy.admin.moudle.development.
dto.DevelopmentInfoAuthenticationDto
;
import
com.lyy.admin.moudle.development.
dto.DevelopmentInfoCollectionDto
;
import
com.lyy.admin.moudle.development.
dto.DevelopmentInfoDto
;
import
com.lyy.admin.moudle.megalopolis.entity.MegalopolisInfoCollectionParam
;
import
com.lyy.admin.moudle.park.entity.ParkInfo
;
import
com.lyy.admin.moudle.park.
entity.ParkInfoAuthenticationParam
;
import
com.lyy.admin.moudle.park.
entity.ParkInfoCollectionParam
;
import
com.lyy.admin.moudle.park.
entity.ParkInfoParam
;
import
com.lyy.admin.moudle.park.
dto.ParkInfoAuthenticationDto
;
import
com.lyy.admin.moudle.park.
dto.ParkInfoCollectionDto
;
import
com.lyy.admin.moudle.park.
dto.ParkInfoDto
;
import
com.lyy.admin.enumerate.DevelopmentStatusEnum
;
import
com.lyy.admin.enumerate.ParkInfoEnum
;
import
com.lyy.admin.moudle.park.vo.ParkInfoDraftListVO
;
...
...
@@ -81,19 +81,19 @@ public class PersonalFunctionsController extends BaseController {
@PostMapping
(
"/getParkSaveAuthentication"
)
@ResponseBody
@ApiOperation
(
value
=
"园区-我的录入"
,
notes
=
"rest风格传参,将参数拼接在url上"
)
public
TableDataInfo
getParkSaveAuthentication
(
ParkInfoAuthentication
Param
parkInfoAuthenticationParam
)
{
parkInfoAuthentication
Param
.
setIsSystem
(
DevelopmentStatusEnum
.
IS_SYSTEM_0
.
getCode
());
parkInfoAuthentication
Param
.
setUserId
(
getUserInfo
().
getUserId
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfoAuthentication
Param
.
getStatus
())){
parkInfoAuthentication
Param
.
setStatusList
(
Arrays
.
asList
(
parkInfoAuthenticationParam
.
getStatus
()));
public
TableDataInfo
getParkSaveAuthentication
(
ParkInfoAuthentication
Dto
parkInfoAuthenticationDto
)
{
parkInfoAuthentication
Dto
.
setIsSystem
(
DevelopmentStatusEnum
.
IS_SYSTEM_0
.
getCode
());
parkInfoAuthentication
Dto
.
setUserId
(
getUserInfo
().
getUserId
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfoAuthentication
Dto
.
getStatus
())){
parkInfoAuthentication
Dto
.
setStatusList
(
Arrays
.
asList
(
parkInfoAuthenticationDto
.
getStatus
()));
}
else
{
parkInfoAuthentication
Param
.
setStatusList
(
Arrays
.
asList
(
parkInfoAuthentication
Dto
.
setStatusList
(
Arrays
.
asList
(
ParkInfoEnum
.
STATUS_RZZ
.
getCode
(),
ParkInfoEnum
.
STATUS_YRZ
.
getCode
(),
ParkInfoEnum
.
STATUS_YJJ
.
getCode
()));
}
// PageUtils.startPage();
List
<
ParkInfoListVO
>
parkInfoListVOS
=
parkInfoService
.
selectParkInfoAuthenticationList
(
parkInfoAuthentication
Param
);
List
<
ParkInfoListVO
>
parkInfoListVOS
=
parkInfoService
.
selectParkInfoAuthenticationList
(
parkInfoAuthentication
Dto
);
return
getDataTable
(
parkInfoListVOS
);
}
...
...
@@ -104,20 +104,20 @@ public class PersonalFunctionsController extends BaseController {
@PostMapping
(
"/getParkEditAuthentication"
)
@ResponseBody
@ApiOperation
(
value
=
"园区-我的完善"
,
notes
=
""
)
public
TableDataInfo
getParkEditAuthentication
(
ParkInfoAuthentication
Param
parkInfoAuthenticationParam
)
{
parkInfoAuthentication
Param
.
setIsSystem
(
DevelopmentStatusEnum
.
IS_SYSTEM_1
.
getCode
());
parkInfoAuthentication
Param
.
setUserId
(
getUserInfo
().
getUserId
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfoAuthentication
Param
.
getStatus
())){
parkInfoAuthentication
Param
.
setStatusList
(
Arrays
.
asList
(
parkInfoAuthenticationParam
.
getStatus
()));
public
TableDataInfo
getParkEditAuthentication
(
ParkInfoAuthentication
Dto
parkInfoAuthenticationDto
)
{
parkInfoAuthentication
Dto
.
setIsSystem
(
DevelopmentStatusEnum
.
IS_SYSTEM_1
.
getCode
());
parkInfoAuthentication
Dto
.
setUserId
(
getUserInfo
().
getUserId
());
if
(
ObjectUtils
.
isNotEmpty
(
parkInfoAuthentication
Dto
.
getStatus
())){
parkInfoAuthentication
Dto
.
setStatusList
(
Arrays
.
asList
(
parkInfoAuthenticationDto
.
getStatus
()));
}
else
{
parkInfoAuthentication
Param
.
setStatusList
(
Arrays
.
asList
(
parkInfoAuthentication
Dto
.
setStatusList
(
Arrays
.
asList
(
ParkInfoEnum
.
STATUS_RZZ
.
getCode
(),
ParkInfoEnum
.
STATUS_YRZ
.
getCode
(),
ParkInfoEnum
.
STATUS_YJJ
.
getCode
(),
ParkInfoEnum
.
STATUS_ZF
.
getCode
()));
}
// PageUtils.startPage();
List
<
ParkInfoListVO
>
parkInfoListVOS
=
parkInfoService
.
selectParkInfoAuthenticationList
(
parkInfoAuthenticationParam
);
List
<
ParkInfoListVO
>
parkInfoListVOS
=
parkInfoService
.
selectParkInfoAuthenticationList
(
parkInfoAuthenticationDto
);
return
getDataTable
(
parkInfoListVOS
);
}
...
...
@@ -129,19 +129,19 @@ public class PersonalFunctionsController extends BaseController {
@PostMapping
(
"/getDevelopmentSaveAuthentication"
)
@ResponseBody
@ApiOperation
(
value
=
"开发区-我的录入"
,
notes
=
"rest风格传参,将参数拼接在url上"
)
public
TableDataInfo
getDevelopmentSaveAuthentication
(
DevelopmentInfoAuthentication
Param
developmentInfoAuthenticationParam
)
{
developmentInfoAuthentication
Param
.
setIsSystem
(
DevelopmentStatusEnum
.
IS_SYSTEM_0
.
getCode
());
developmentInfoAuthentication
Param
.
setUserId
(
getUserInfo
().
getUserId
());
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfoAuthentication
Param
.
getStatus
())){
developmentInfoAuthentication
Param
.
setStatusList
(
Arrays
.
asList
(
developmentInfoAuthenticationParam
.
getStatus
()));
public
TableDataInfo
getDevelopmentSaveAuthentication
(
DevelopmentInfoAuthentication
Dto
developmentInfoAuthenticationDto
)
{
developmentInfoAuthentication
Dto
.
setIsSystem
(
DevelopmentStatusEnum
.
IS_SYSTEM_0
.
getCode
());
developmentInfoAuthentication
Dto
.
setUserId
(
getUserInfo
().
getUserId
());
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfoAuthentication
Dto
.
getStatus
())){
developmentInfoAuthentication
Dto
.
setStatusList
(
Arrays
.
asList
(
developmentInfoAuthenticationDto
.
getStatus
()));
}
else
{
developmentInfoAuthentication
Param
.
setStatusList
(
Arrays
.
asList
(
developmentInfoAuthentication
Dto
.
setStatusList
(
Arrays
.
asList
(
DevelopmentStatusEnum
.
STATUS_RZZ
.
getCode
(),
DevelopmentStatusEnum
.
STATUS_YRZ
.
getCode
(),
DevelopmentStatusEnum
.
STATUS_YJJ
.
getCode
()));
}
// PageUtils.startPage();
List
<
DevelopmentInfoListVO
>
parkInfoListVOS
=
developmentInfoService
.
selectDevelopmentInfoAuthenticationList
(
developmentInfoAuthentication
Param
);
List
<
DevelopmentInfoListVO
>
parkInfoListVOS
=
developmentInfoService
.
selectDevelopmentInfoAuthenticationList
(
developmentInfoAuthentication
Dto
);
return
getDataTable
(
parkInfoListVOS
);
}
...
...
@@ -152,20 +152,20 @@ public class PersonalFunctionsController extends BaseController {
@PostMapping
(
"/getDevelopmentEditAuthentication"
)
@ResponseBody
@ApiOperation
(
value
=
"开发区-我的完善"
,
notes
=
"rest风格传参,将参数拼接在url上"
)
public
TableDataInfo
getDevelopmentEditAuthentication
(
DevelopmentInfoAuthentication
Param
developmentInfoAuthenticationParam
)
{
developmentInfoAuthentication
Param
.
setIsSystem
(
DevelopmentStatusEnum
.
IS_SYSTEM_1
.
getCode
());
developmentInfoAuthentication
Param
.
setUserId
(
getUserInfo
().
getUserId
());
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfoAuthentication
Param
.
getStatus
())){
developmentInfoAuthentication
Param
.
setStatusList
(
Arrays
.
asList
(
developmentInfoAuthenticationParam
.
getStatus
()));
public
TableDataInfo
getDevelopmentEditAuthentication
(
DevelopmentInfoAuthentication
Dto
developmentInfoAuthenticationDto
)
{
developmentInfoAuthentication
Dto
.
setIsSystem
(
DevelopmentStatusEnum
.
IS_SYSTEM_1
.
getCode
());
developmentInfoAuthentication
Dto
.
setUserId
(
getUserInfo
().
getUserId
());
if
(
ObjectUtils
.
isNotEmpty
(
developmentInfoAuthentication
Dto
.
getStatus
())){
developmentInfoAuthentication
Dto
.
setStatusList
(
Arrays
.
asList
(
developmentInfoAuthenticationDto
.
getStatus
()));
}
else
{
developmentInfoAuthentication
Param
.
setStatusList
(
Arrays
.
asList
(
developmentInfoAuthentication
Dto
.
setStatusList
(
Arrays
.
asList
(
DevelopmentStatusEnum
.
STATUS_RZZ
.
getCode
(),
DevelopmentStatusEnum
.
STATUS_YRZ
.
getCode
(),
DevelopmentStatusEnum
.
STATUS_YJJ
.
getCode
(),
DevelopmentStatusEnum
.
STATUS_ZF
.
getCode
()));
}
// PageUtils.startPage();
List
<
DevelopmentInfoListVO
>
parkInfoListVOS
=
developmentInfoService
.
selectDevelopmentInfoAuthenticationList
(
developmentInfoAuthentication
Param
);
List
<
DevelopmentInfoListVO
>
parkInfoListVOS
=
developmentInfoService
.
selectDevelopmentInfoAuthenticationList
(
developmentInfoAuthentication
Dto
);
return
getDataTable
(
parkInfoListVOS
)
;
}
...
...
@@ -223,7 +223,7 @@ public class PersonalFunctionsController extends BaseController {
@ApiImplicitParam
(
name
=
"orderByColumn"
,
value
=
"排序字段(可为空,传类属性)"
,
type
=
"String"
),
@ApiImplicitParam
(
name
=
"isAsc"
,
value
=
"排序字段(可为空,请传asc或者desc)"
,
type
=
"String"
)
})
public
SysCollectionListVO
getDevelopmentInfoCollection
(
DevelopmentInfoCollection
Param
developmentInfoParam
)
{
public
SysCollectionListVO
getDevelopmentInfoCollection
(
DevelopmentInfoCollection
Dto
developmentInfoParam
)
{
String
planArea
=
developmentInfoParam
.
getPlanArea
();
if
(
ObjectUtils
.
isNotEmpty
(
planArea
))
{
if
(
planArea
.
contains
(
"-"
))
{
...
...
@@ -260,7 +260,7 @@ public class PersonalFunctionsController extends BaseController {
@ApiImplicitParam
(
name
=
"orderByColumn"
,
value
=
"排序字段(可为空,传类属性)"
,
type
=
"String"
),
@ApiImplicitParam
(
name
=
"isAsc"
,
value
=
"排序字段(可为空,请传asc或者desc)"
,
type
=
"String"
)
})
public
SysCollectionListVO
getParkInfoCollection
(
ParkInfoCollection
Param
parkInfoParam
)
{
public
SysCollectionListVO
getParkInfoCollection
(
ParkInfoCollection
Dto
parkInfoParam
)
{
String
coverArea
=
parkInfoParam
.
getCoverArea
();
if
(
ObjectUtils
.
isNotEmpty
(
coverArea
))
{
if
(
coverArea
.
contains
(
"-"
))
{
...
...
@@ -345,11 +345,11 @@ public class PersonalFunctionsController extends BaseController {
@ApiImplicitParam
(
name
=
"isAsc"
,
value
=
"排序字段(可为空,请传asc或者desc)"
,
type
=
"String"
)
})
public
TableDataInfo
parkList
()
{
ParkInfo
Param
parkInfoParam
=
new
ParkInfoParam
();
parkInfo
Param
.
setUserId
(
getUserInfo
().
getUserId
());
parkInfo
Param
.
setStatus
(
String
.
valueOf
(
ParkInfoEnum
.
STATUS_WRZ
.
getCode
()));
ParkInfo
Dto
parkInfoDto
=
new
ParkInfoDto
();
parkInfo
Dto
.
setUserId
(
getUserInfo
().
getUserId
());
parkInfo
Dto
.
setStatus
(
String
.
valueOf
(
ParkInfoEnum
.
STATUS_WRZ
.
getCode
()));
startPage
();
List
<
ParkInfo
>
lists
=
parkInfoService
.
selectParkInfoDraftListVO
(
parkInfo
Param
);
List
<
ParkInfo
>
lists
=
parkInfoService
.
selectParkInfoDraftListVO
(
parkInfo
Dto
);
List
<
ParkInfoDraftListVO
>
parkInfoListVOs
=
lists
.
stream
().
map
(
parkInfo
->
{
ParkInfoDraftListVO
parkInfoListVO
=
new
ParkInfoDraftListVO
();
BeanUtils
.
copyProperties
(
parkInfo
,
parkInfoListVO
);
...
...
@@ -371,11 +371,11 @@ public class PersonalFunctionsController extends BaseController {
@ApiImplicitParam
(
name
=
"isAsc"
,
value
=
"排序字段(可为空,请传asc或者desc)"
,
type
=
"String"
)
})
public
TableDataInfo
developmentList
()
{
DevelopmentInfo
Param
developmentInfoParam
=
new
DevelopmentInfoParam
();
developmentInfo
Param
.
setUserId
(
getUserInfo
().
getUserId
());
developmentInfo
Param
.
setStatus
(
String
.
valueOf
(
DevelopmentStatusEnum
.
STATUS_WRZ
.
getCode
()));
DevelopmentInfo
Dto
developmentInfoDto
=
new
DevelopmentInfoDto
();
developmentInfo
Dto
.
setUserId
(
getUserInfo
().
getUserId
());
developmentInfo
Dto
.
setStatus
(
String
.
valueOf
(
DevelopmentStatusEnum
.
STATUS_WRZ
.
getCode
()));
startPage
();
List
<
DevelopmentInfo
>
lists
=
developmentInfoService
.
selectDevelopmentInfoDraftList
(
developmentInfo
Param
);
List
<
DevelopmentInfo
>
lists
=
developmentInfoService
.
selectDevelopmentInfoDraftList
(
developmentInfo
Dto
);
List
<
DevelopmentInfoDraftListVO
>
developmentInfoListVOs
=
lists
.
stream
().
map
(
developmentInfo
->
{
DevelopmentInfoDraftListVO
developmentInfoVO
=
new
DevelopmentInfoDraftListVO
();
...
...
src/main/resources/application.yml
View file @
d66096c1
...
...
@@ -59,7 +59,7 @@ mybatis-plus:
# 是否开启二级缓存。
cache-enabled
:
false
# 指定实体类的包路径,用于自动扫描并注册类型别名。
type-aliases-package
:
com.lyy.admin.moudle.**.entity,com.lyy.admin.moudle.**.vo
type-aliases-package
:
com.lyy.admin.moudle.**.entity,com.lyy.admin.moudle.**.vo
,com.lyy.admin.moudle.**.dto
#处理自增id异常
global-config
:
db-config
:
...
...
src/main/resources/mapper/developmentinfo/DevelopmentInfoMapper.xml
View file @
d66096c1
...
...
@@ -162,7 +162,7 @@
</where>
</select>
<select
id=
"selectDevelopmentInfoCollectionList"
parameterType=
"DevelopmentInfoCollection
Param
"
resultType=
"com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO"
>
<select
id=
"selectDevelopmentInfoCollectionList"
parameterType=
"DevelopmentInfoCollection
Dto
"
resultType=
"com.lyy.admin.moudle.development.vo.DevelopmentInfoListVO"
>
select
<include
refid=
"DevelopmentInfoVOList"
/>
from development_info sc,sys_collection d
<where>
sc.id = d.collect_id and d.user_id = #{userId} and d.type = 1
...
...
@@ -195,7 +195,7 @@
</select>
<select
id=
"selectDevelopmentInfoAuthenticationList"
parameterType=
"ParkInfoAuthentication
Param
"
resultType=
"DevelopmentInfoListVO"
>
<select
id=
"selectDevelopmentInfoAuthenticationList"
parameterType=
"ParkInfoAuthentication
Dto
"
resultType=
"DevelopmentInfoListVO"
>
select
<include
refid=
"DevelopmentInfoVOList1"
/>
from development_info
<where>
user_id = #{param.userId}
...
...
src/main/resources/mapper/parkinfo/ParkInfoMapper.xml
View file @
d66096c1
...
...
@@ -177,7 +177,7 @@
</where>
</select>
<select
id=
"selectParkInfoAuthenticationList"
parameterType=
"ParkInfoAuthentication
Param
"
resultType=
"ParkInfoListVO"
>
<select
id=
"selectParkInfoAuthenticationList"
parameterType=
"ParkInfoAuthentication
Dto
"
resultType=
"ParkInfoListVO"
>
select
<include
refid=
"ParkInfoVOList"
/>
from park_info
<where>
user_id = #{param.userId}
...
...
@@ -207,7 +207,7 @@
</select>
<select
id=
"selectParkInfoCollectionList"
parameterType=
"ParkInfoCollection
Param
"
resultType=
"ParkInfoListVO"
>
<select
id=
"selectParkInfoCollectionList"
parameterType=
"ParkInfoCollection
Dto
"
resultType=
"ParkInfoListVO"
>
select
<include
refid=
"ParkInfoVOList1"
/>
from park_info sc, sys_collection p
<where>
sc.id = p.collect_id and p.user_id = #{userId} and p.type = 2
...
...
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