Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
fd323b89
Commit
fd323b89
authored
Jun 07, 2021
by
付培阳
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
根据数据字典将key值转换为value
parent
8592c381
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
263 additions
and
112 deletions
+263
-112
AmosFeignService.java
.../yeejoin/amos/boot/biz/common/feign/AmosFeignService.java
+1
-1
ElevatorDto.java
...com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorDto.java
+1
-1
MaintenanceUnitDto.java
...join/amos/boot/module/tzs/api/dto/MaintenanceUnitDto.java
+5
-11
RescueStationDto.java
...eejoin/amos/boot/module/tzs/api/dto/RescueStationDto.java
+5
-11
UseUnitDto.java
.../com/yeejoin/amos/boot/module/tzs/api/dto/UseUnitDto.java
+5
-11
Elevator.java
...com/yeejoin/amos/boot/module/tzs/api/entity/Elevator.java
+1
-1
MaintenanceUnit.java
...join/amos/boot/module/tzs/api/entity/MaintenanceUnit.java
+5
-11
RescueStation.java
...eejoin/amos/boot/module/tzs/api/entity/RescueStation.java
+5
-11
UseUnit.java
.../com/yeejoin/amos/boot/module/tzs/api/entity/UseUnit.java
+5
-11
ElevatorVo.java
...a/com/yeejoin/amos/boot/module/tzs/api/vo/ElevatorVo.java
+3
-1
MaintenanceUnitVo.java
...eejoin/amos/boot/module/tzs/api/vo/MaintenanceUnitVo.java
+6
-11
RescueStationVo.java
.../yeejoin/amos/boot/module/tzs/api/vo/RescueStationVo.java
+7
-12
UseUnitVo.java
...va/com/yeejoin/amos/boot/module/tzs/api/vo/UseUnitVo.java
+7
-12
ElevatorController.java
...os/boot/module/tzs/biz/controller/ElevatorController.java
+4
-3
MaintenanceUnitController.java
.../module/tzs/biz/controller/MaintenanceUnitController.java
+5
-3
BeanDtoVoUtils.java
...eejoin/amos/boot/module/tzs/biz/utils/BeanDtoVoUtils.java
+196
-1
application.properties
...boot-tzs-system/src/main/resources/application.properties
+2
-0
No files found.
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/feign/AmosFeignService.java
View file @
fd323b89
...
...
@@ -25,7 +25,7 @@ public class AmosFeignService {
* @param dictCode
* @return
*/
public
Object
listDictionaryByDictCode
(
String
dictCode
)
throws
Exception
{
public
List
<
DictionarieValueModel
>
listDictionaryByDictCode
(
String
dictCode
)
throws
Exception
{
logger
.
info
(
"===========>listDictionaryByDictCode方法请求参数:{}"
,
dictCode
);
List
<
DictionarieValueModel
>
dictionaryModel
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorDto.java
View file @
fd323b89
...
...
@@ -70,7 +70,7 @@ public class ElevatorDto extends BaseEntity {
private
String
category
;
@ApiModelProperty
(
value
=
"使用场所分类"
)
private
String
useSiteCateg
ro
y
;
private
String
useSiteCateg
or
y
;
@ApiModelProperty
(
value
=
"电梯型号"
)
private
String
model
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/MaintenanceUnitDto.java
View file @
fd323b89
...
...
@@ -7,22 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
/**
*
*
* @author tb
* @date 2021-06-01
*/
* @author tb
* @date 2021-06-01
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"cb_maintenance_unit"
)
@ApiModel
(
value
=
"MaintenanceUnitDto"
,
description
=
"
"
)
@ApiModel
(
value
=
"MaintenanceUnitDto"
,
description
=
"MaintenanceUnitDto
"
)
public
class
MaintenanceUnitDto
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/RescueStationDto.java
View file @
fd323b89
...
...
@@ -7,22 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
/**
*
*
* @author tb
* @date 2021-06-01
*/
* @author tb
* @date 2021-06-01
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"tcb_rescue_station"
)
@ApiModel
(
value
=
"RescueStationDto"
,
description
=
"
"
)
@ApiModel
(
value
=
"RescueStationDto"
,
description
=
"RescueStationDto
"
)
public
class
RescueStationDto
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/UseUnitDto.java
View file @
fd323b89
...
...
@@ -7,22 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
/**
*
*
* @author tb
* @date 2021-06-01
*/
* @author tb
* @date 2021-06-01
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"tcb_use_unit"
)
@ApiModel
(
value
=
"UseUnitDto"
,
description
=
"
"
)
@ApiModel
(
value
=
"UseUnitDto"
,
description
=
"UseUnitDto
"
)
public
class
UseUnitDto
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/Elevator.java
View file @
fd323b89
...
...
@@ -71,7 +71,7 @@ public class Elevator extends BaseEntity {
private
String
category
;
@ApiModelProperty
(
value
=
"使用场所分类"
)
private
String
useSiteCateg
ro
y
;
private
String
useSiteCateg
or
y
;
@ApiModelProperty
(
value
=
"电梯型号"
)
private
String
model
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/MaintenanceUnit.java
View file @
fd323b89
...
...
@@ -7,22 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
/**
*
*
* @author tb
* @date 2021-06-01
*/
* @author tb
* @date 2021-06-01
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"cb_maintenance_unit"
)
@ApiModel
(
value
=
"MaintenanceUnit对象"
,
description
=
"
"
)
@ApiModel
(
value
=
"MaintenanceUnit对象"
,
description
=
"MaintenanceUnit对象
"
)
public
class
MaintenanceUnit
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/RescueStation.java
View file @
fd323b89
...
...
@@ -7,22 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
/**
*
*
* @author tb
* @date 2021-06-01
*/
* @author tb
* @date 2021-06-01
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"tcb_rescue_station"
)
@ApiModel
(
value
=
"RescueStation对象"
,
description
=
"
"
)
@ApiModel
(
value
=
"RescueStation对象"
,
description
=
"RescueStation对象
"
)
public
class
RescueStation
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/UseUnit.java
View file @
fd323b89
...
...
@@ -7,22 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
/**
*
*
* @author tb
* @date 2021-06-01
*/
* @author tb
* @date 2021-06-01
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"tcb_use_unit"
)
@ApiModel
(
value
=
"UseUnit对象"
,
description
=
"
"
)
@ApiModel
(
value
=
"UseUnit对象"
,
description
=
"UseUnit对象
"
)
public
class
UseUnit
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/ElevatorVo.java
View file @
fd323b89
...
...
@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
/**
...
...
@@ -15,6 +16,7 @@ import lombok.experimental.Accessors;
* @date 2021-06-01
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"tcb_elevator"
)
@ApiModel
(
value
=
"ElevatorVo"
,
description
=
"ElevatorVo"
)
...
...
@@ -69,7 +71,7 @@ public class ElevatorVo extends BaseEntity {
private
String
category
;
@ApiModelProperty
(
value
=
"使用场所分类"
)
private
String
useSiteCateg
ro
y
;
private
String
useSiteCateg
or
y
;
@ApiModelProperty
(
value
=
"电梯型号"
)
private
String
model
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/MaintenanceUnitVo.java
View file @
fd323b89
...
...
@@ -7,21 +7,16 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
/**
*
*
* @author tb
* @date 2021-06-01
*/
* @author tb
* @date 2021-06-01
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"cb_maintenance_unit"
)
@ApiModel
(
value
=
"MaintenanceUnitVo"
,
description
=
"
"
)
@ApiModel
(
value
=
"MaintenanceUnitVo"
,
description
=
"MaintenanceUnitVo
"
)
public
class
MaintenanceUnitVo
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/RescueStationVo.java
View file @
fd323b89
...
...
@@ -7,22 +7,17 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
/**
*
*
* @author tb
* @date 2021-06-01
*/
* @author tb
* @date 2021-06-01
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"tcb_rescue_station"
)
@ApiModel
(
value
=
"RescueStationVo"
,
description
=
"
"
)
public
class
RescueStationVo
extends
BaseEntity
{
@ApiModel
(
value
=
"RescueStationVo"
,
description
=
"RescueStationVo
"
)
public
class
RescueStationVo
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/vo/UseUnitVo.java
View file @
fd323b89
...
...
@@ -7,22 +7,17 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.experimental.Accessors
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.fasterxml.jackson.databind.annotation.JsonSerialize
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
com.fasterxml.jackson.databind.ser.std.ToStringSerializer
;
/**
*
*
* @author tb
* @date 2021-06-01
*/
* @author tb
* @date 2021-06-01
*/
@Data
@EqualsAndHashCode
(
callSuper
=
true
)
@Accessors
(
chain
=
true
)
@TableName
(
"tcb_use_unit"
)
@ApiModel
(
value
=
"UseUnitVo"
,
description
=
"
"
)
public
class
UseUnitVo
extends
BaseEntity
{
@ApiModel
(
value
=
"UseUnitVo"
,
description
=
"UseUnitVo
"
)
public
class
UseUnitVo
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/ElevatorController.java
View file @
fd323b89
...
...
@@ -26,6 +26,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import
org.typroject.tyboot.core.foundation.enumeration.UserType
;
import
java.util.Arrays
;
import
java.util.List
;
/**
* 电梯Api
...
...
@@ -96,7 +97,7 @@ public class ElevatorController extends BaseController {
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据id查询"
,
notes
=
"根据id查询"
)
public
ElevatorVo
selectById
(
@PathVariable
Long
id
)
{
Elevator
elevator
=
iElevatorService
.
getById
(
id
);
return
BeanDtoVoUtils
.
convert
(
elevator
,
ElevatorVo
.
class
);
return
BeanDtoVoUtils
.
convert
ElevatorEntityToVo
(
elevator
);
}
/**
...
...
@@ -147,7 +148,7 @@ public class ElevatorController extends BaseController {
pageBean
=
new
Page
<>(
Integer
.
parseInt
(
pageNum
),
Integer
.
parseInt
(
pageSize
));
}
page
=
iElevatorService
.
page
(
pageBean
,
elevatorQueryWrapper
);
return
BeanDtoVoUtils
.
iPageVoStream
(
page
,
ElevatorVo
.
class
);
return
BeanDtoVoUtils
.
elevatorIPageVo
(
page
);
}
/**
...
...
@@ -194,7 +195,7 @@ public class ElevatorController extends BaseController {
pageBean
=
new
Page
<>(
Integer
.
parseInt
(
pageNum
),
Integer
.
parseInt
(
pageSize
));
}
page
=
iElevatorService
.
page
(
pageBean
,
elevatorQueryWrapper
);
return
BeanDtoVoUtils
.
iPageVoStream
(
page
,
ElevatorVo
.
class
);
return
BeanDtoVoUtils
.
elevatorIPageVo
(
page
);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/MaintenanceUnitController.java
View file @
fd323b89
...
...
@@ -9,6 +9,7 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit;
import
com.yeejoin.amos.boot.module.tzs.api.service.IMaintenanceUnitService
;
import
com.yeejoin.amos.boot.module.tzs.api.vo.MaintenanceUnitVo
;
import
com.yeejoin.amos.boot.module.tzs.biz.utils.BeanDtoVoUtils
;
import
com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.commons.lang3.StringUtils
;
...
...
@@ -20,6 +21,7 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
import
org.typroject.tyboot.core.restful.doc.TycloudOperation
;
import
java.util.Arrays
;
import
java.util.List
;
/**
...
...
@@ -89,7 +91,7 @@ public class MaintenanceUnitController extends BaseController {
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"根据id查询"
,
notes
=
"根据id查询"
)
public
MaintenanceUnitVo
selectById
(
@PathVariable
Long
id
)
{
MaintenanceUnit
maintenanceUnit
=
iMaintenanceUnitService
.
getById
(
id
);
return
BeanDtoVoUtils
.
convert
(
maintenanceUnit
,
MaintenanceUnitVo
.
class
);
return
BeanDtoVoUtils
.
convert
MaintenanceUnitEntityToVo
(
maintenanceUnit
);
}
/**
...
...
@@ -140,7 +142,7 @@ public class MaintenanceUnitController extends BaseController {
pageBean
=
new
Page
<>(
Integer
.
parseInt
(
pageNum
),
Integer
.
parseInt
(
pageSize
));
}
page
=
iMaintenanceUnitService
.
page
(
pageBean
,
maintenanceUnitQueryWrapper
);
return
BeanDtoVoUtils
.
iPageVoStream
(
page
,
MaintenanceUnitVo
.
class
);
return
BeanDtoVoUtils
.
maintenanceUnitIPageVo
(
page
);
}
/**
...
...
@@ -188,7 +190,7 @@ public class MaintenanceUnitController extends BaseController {
pageBean
=
new
Page
<>(
Integer
.
parseInt
(
pageNum
),
Integer
.
parseInt
(
pageSize
));
}
page
=
iMaintenanceUnitService
.
page
(
pageBean
,
maintenanceUnitQueryWrapper
);
return
BeanDtoVoUtils
.
iPageVoStream
(
page
,
MaintenanceUnitVo
.
class
);
return
BeanDtoVoUtils
.
maintenanceUnitIPageVo
(
page
);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/utils/BeanDtoVoUtils.java
View file @
fd323b89
package
com
.
yeejoin
.
amos
.
boot
.
module
.
tzs
.
biz
.
utils
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.yeejoin.amos.boot.biz.common.feign.AmosFeignService
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.Elevator
;
import
com.yeejoin.amos.boot.module.tzs.api.entity.MaintenanceUnit
;
import
com.yeejoin.amos.boot.module.tzs.api.vo.ElevatorVo
;
import
com.yeejoin.amos.boot.module.tzs.api.vo.MaintenanceUnitVo
;
import
com.yeejoin.amos.boot.module.tzs.biz.controller.ElevatorController
;
import
com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
javax.annotation.PostConstruct
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Stream
;
/**
...
...
@@ -9,10 +25,46 @@ import org.springframework.beans.BeanUtils;
* @Author fpy
* @Date: 2021/6/3 13:53
*/
@Component
public
class
BeanDtoVoUtils
{
private
static
final
Logger
logger
=
LoggerFactory
.
getLogger
(
BeanDtoVoUtils
.
class
);
@Autowired
private
AmosFeignService
amosFeignService
;
private
static
BeanDtoVoUtils
beanDtoVoUtils
;
private
static
List
<
DictionarieValueModel
>
elevatorCategory
;
private
static
List
<
DictionarieValueModel
>
elevatorUseSiteCategory
;
private
static
List
<
DictionarieValueModel
>
elevatorMaintainType
;
private
static
List
<
DictionarieValueModel
>
elevatorMaintainPeriod
;
private
static
List
<
DictionarieValueModel
>
elevatorDragMode
;
private
static
List
<
DictionarieValueModel
>
qualificationLevel
;
@PostConstruct
public
void
init
()
{
beanDtoVoUtils
=
this
;
beanDtoVoUtils
.
amosFeignService
=
this
.
amosFeignService
;
}
public
static
void
getElevatorDictionaryByDictCode
()
throws
Exception
{
elevatorCategory
=
beanDtoVoUtils
.
amosFeignService
.
listDictionaryByDictCode
(
"ELEVATOR_CATEGORY"
);
elevatorUseSiteCategory
=
beanDtoVoUtils
.
amosFeignService
.
listDictionaryByDictCode
(
"ELEVATOR_USE_SITE_CATEGORY"
);
elevatorMaintainType
=
beanDtoVoUtils
.
amosFeignService
.
listDictionaryByDictCode
(
"ELEVATOR_MAINTAIN_TYPE"
);
elevatorMaintainPeriod
=
beanDtoVoUtils
.
amosFeignService
.
listDictionaryByDictCode
(
"ELEVATOR_MAINTAIN_PERIOD"
);
elevatorDragMode
=
beanDtoVoUtils
.
amosFeignService
.
listDictionaryByDictCode
(
"ELEVATOR_DRAG_MODE"
);
}
public
static
void
getMaintenanceUnitDictionaryByDictCode
()
throws
Exception
{
qualificationLevel
=
beanDtoVoUtils
.
amosFeignService
.
listDictionaryByDictCode
(
"MAINTENANCE_UNIT_QUALIFICATION_LEVEL"
);
}
/**
* Dot ,
D
o ,Entity 相互转换
* Dot ,
V
o ,Entity 相互转换
*
* @param source 原数据
* @param targetClass 目标类
...
...
@@ -36,6 +88,7 @@ public class BeanDtoVoUtils {
// 返回新对象
return
target
;
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
null
;
}
}
...
...
@@ -58,4 +111,145 @@ public class BeanDtoVoUtils {
}
});
}
public
static
ElevatorVo
convertElevatorEntityToVo
(
Elevator
source
)
{
// 判断source是否为空
if
(
source
==
null
)
{
return
null
;
}
try
{
// 创建新的对象实例
ElevatorVo
target
=
new
ElevatorVo
();
// 把原对象数据拷贝到新对象
BeanUtils
.
copyProperties
(
source
,
target
);
// 根据数据字典设置值
getElevatorDictionaryByDictCode
();
List
<
DictionarieValueModel
>
categoryValue
=
elevatorCategory
.
stream
().
filter
(
e
->
e
.
getDictDataKey
().
equals
(
source
.
getCategory
())).
collect
(
Collectors
.
toList
());
target
.
setCategory
(
categoryValue
.
isEmpty
()
?
""
:
categoryValue
.
get
(
0
).
getDictDataValue
());
List
<
DictionarieValueModel
>
useSiteCategoryValue
=
elevatorUseSiteCategory
.
stream
().
filter
(
e
->
e
.
getDictDataKey
().
equals
(
source
.
getUseSiteCategory
())).
collect
(
Collectors
.
toList
());
target
.
setUseSiteCategory
(
useSiteCategoryValue
.
isEmpty
()
?
""
:
useSiteCategoryValue
.
get
(
0
).
getDictDataValue
());
List
<
DictionarieValueModel
>
maintainTypeValue
=
elevatorMaintainType
.
stream
().
filter
(
e
->
e
.
getDictDataKey
().
equals
(
source
.
getMaintainType
())).
collect
(
Collectors
.
toList
());
target
.
setMaintainType
(
maintainTypeValue
.
isEmpty
()
?
""
:
maintainTypeValue
.
get
(
0
).
getDictDataValue
());
List
<
DictionarieValueModel
>
maintainPeriodValue
=
elevatorMaintainPeriod
.
stream
().
filter
(
e
->
e
.
getDictDataKey
().
equals
(
source
.
getMaintainPeriod
())).
collect
(
Collectors
.
toList
());
target
.
setMaintainPeriod
(
maintainPeriodValue
.
isEmpty
()
?
""
:
maintainPeriodValue
.
get
(
0
).
getDictDataValue
());
List
<
DictionarieValueModel
>
dragModeValue
=
elevatorDragMode
.
stream
().
filter
(
e
->
e
.
getDictDataKey
().
equals
(
source
.
getDragMode
())).
collect
(
Collectors
.
toList
());
target
.
setDragMode
(
dragModeValue
.
isEmpty
()
?
""
:
dragModeValue
.
get
(
0
).
getDictDataValue
());
// 返回新对象
return
target
;
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
null
;
}
}
public
static
ElevatorVo
convertElevatorEntityToVo2
(
Elevator
source
,
List
<
DictionarieValueModel
>
elevatorCategory
,
List
<
DictionarieValueModel
>
elevatorUseSiteCategory
,
List
<
DictionarieValueModel
>
elevatorMaintainType
,
List
<
DictionarieValueModel
>
elevatorMaintainPeriod
,
List
<
DictionarieValueModel
>
elevatorDragMode
)
{
// 判断source是否为空
if
(
source
==
null
)
{
return
null
;
}
try
{
// 创建新的对象实例
ElevatorVo
target
=
new
ElevatorVo
();
// 把原对象数据拷贝到新对象
BeanUtils
.
copyProperties
(
source
,
target
);
// 根据数据字典设置值
List
<
DictionarieValueModel
>
collect
=
elevatorCategory
.
stream
().
filter
(
e
->
e
.
getDictDataKey
().
equals
(
source
.
getCategory
())).
collect
(
Collectors
.
toList
());
target
.
setCategory
(
collect
.
isEmpty
()
?
""
:
collect
.
get
(
0
).
getDictDataValue
());
Stream
<
DictionarieValueModel
>
dictionarieValueModelStream
=
elevatorUseSiteCategory
.
stream
().
filter
(
e
->
e
.
getDictDataKey
().
equals
(
source
.
getUseSiteCategory
()));
target
.
setUseSiteCategory
(
elevatorUseSiteCategory
.
stream
().
filter
(
e
->
e
.
getDictDataKey
().
equals
(
source
.
getUseSiteCategory
())).
collect
(
Collectors
.
toList
()).
get
(
0
).
getDictDataValue
());
target
.
setMaintainType
(
elevatorMaintainType
.
stream
().
filter
(
e
->
e
.
getDictDataKey
().
equals
(
source
.
getMaintainType
())).
collect
(
Collectors
.
toList
()).
get
(
0
).
getDictDataValue
());
target
.
setMaintainPeriod
(
elevatorMaintainPeriod
.
stream
().
filter
(
e
->
e
.
getDictDataKey
().
equals
(
source
.
getMaintainPeriod
())).
collect
(
Collectors
.
toList
()).
get
(
0
).
getDictDataValue
());
target
.
setDragMode
(
elevatorDragMode
.
stream
().
filter
(
e
->
e
.
getDictDataKey
().
equals
(
source
.
getDragMode
())).
collect
(
Collectors
.
toList
()).
get
(
0
).
getDictDataValue
());
// 返回新对象
return
target
;
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
null
;
}
}
/**
* 将Elevator转换位IPage<ElevatorVo>
*
* @param page 原分页对象
* @return
*/
public
static
IPage
<
ElevatorVo
>
elevatorIPageVo
(
IPage
<
Elevator
>
page
)
{
return
page
.
convert
(
item
->
{
try
{
return
convertElevatorEntityToVo
(
item
);
}
catch
(
Exception
e
)
{
return
null
;
}
});
}
public
static
IPage
<
ElevatorVo
>
elevatorIPageVo2
(
IPage
<
Elevator
>
page
,
List
<
DictionarieValueModel
>
elevatorCategory
,
List
<
DictionarieValueModel
>
elevatorUseSiteCategory
,
List
<
DictionarieValueModel
>
elevatorMaintainType
,
List
<
DictionarieValueModel
>
elevatorMaintainPeriod
,
List
<
DictionarieValueModel
>
elevatorDragMode
)
{
return
page
.
convert
(
item
->
{
try
{
return
convertElevatorEntityToVo2
(
item
,
elevatorCategory
,
elevatorUseSiteCategory
,
elevatorMaintainType
,
elevatorMaintainPeriod
,
elevatorDragMode
);
}
catch
(
Exception
e
)
{
return
null
;
}
});
}
public
static
MaintenanceUnitVo
convertMaintenanceUnitEntityToVo
(
MaintenanceUnit
source
)
{
// 判断source是否为空
if
(
source
==
null
)
{
return
null
;
}
try
{
// 创建新的对象实例
MaintenanceUnitVo
target
=
new
MaintenanceUnitVo
();
// 把原对象数据拷贝到新对象
BeanUtils
.
copyProperties
(
source
,
target
);
// 返回新对象
// 根据数据字典设置值
getMaintenanceUnitDictionaryByDictCode
();
List
<
DictionarieValueModel
>
qualificationLevelValue
=
qualificationLevel
.
stream
().
filter
(
e
->
e
.
getDictDataKey
().
equals
(
source
.
getQualificationLevel
())).
collect
(
Collectors
.
toList
());
target
.
setQualificationLevel
(
qualificationLevelValue
.
isEmpty
()
?
""
:
qualificationLevelValue
.
get
(
0
).
getDictDataDesc
());
return
target
;
}
catch
(
Exception
e
)
{
return
null
;
}
}
/**
* 将Elevator转换位IPage<ElevatorVo>
*
* @param page 原分页对象
* @return
*/
public
static
IPage
<
MaintenanceUnitVo
>
maintenanceUnitIPageVo
(
IPage
<
MaintenanceUnit
>
page
)
{
return
page
.
convert
(
item
->
{
try
{
return
convertMaintenanceUnitEntityToVo
(
item
);
}
catch
(
Exception
e
)
{
return
null
;
}
});
}
}
\ No newline at end of file
amos-boot-tzs-system/src/main/resources/application.properties
View file @
fd323b89
spring.application.name
=
SPECIAL-EQUIPMENT
server.port
=
10000
spring.profiles.active
=
dev
server.servlet.context-path
=
/specialEquipment
\ 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