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
1cff153b
Commit
1cff153b
authored
Jul 01, 2021
by
fupeiyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
消防专家接口修改
parent
67ba4802
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
28 deletions
+23
-28
FireExpertsController.java
...boot/module/jcs/biz/controller/FireExpertsController.java
+2
-1
FireExpertsServiceImpl.java
...t/module/jcs/biz/service/impl/FireExpertsServiceImpl.java
+12
-8
BeanDtoVoUtils.java
...eejoin/amos/boot/module/jcs/biz/utils/BeanDtoVoUtils.java
+9
-19
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FireExpertsController.java
View file @
1cff153b
...
...
@@ -125,6 +125,7 @@ public class FireExpertsController extends BaseController {
FireExperts
fireExperts
=
BeanDtoVoUtils
.
convert
(
fireExpertsDto
,
FireExperts
.
class
);
Page
<
FireExperts
>
pageBean
;
QueryWrapper
<
FireExperts
>
fireExpertsQueryWrapper
=
new
QueryWrapper
<>();
fireExpertsQueryWrapper
.
eq
(
"is_delete"
,
false
);
Class
<?
extends
FireExperts
>
aClass
=
fireExperts
.
getClass
();
Arrays
.
stream
(
aClass
.
getDeclaredFields
()).
forEach
(
field
->
{
try
{
...
...
@@ -171,7 +172,7 @@ public class FireExpertsController extends BaseController {
@ApiOperation
(
httpMethod
=
"GET"
,
value
=
"列表全部数据查询"
,
notes
=
"列表全部数据查询"
)
@GetMapping
(
value
=
"/list"
)
public
ResponseModel
<
List
<
FireExpertsDto
>>
selectForList
()
{
List
<
FireExpertsDto
>
fireExpertsDtoList
=
fireExpertsServiceImpl
.
queryForFireExpertsList
();
List
<
FireExpertsDto
>
fireExpertsDtoList
=
fireExpertsServiceImpl
.
queryForFireExpertsList
(
false
);
fireExpertsDtoList
.
stream
().
map
(
item
->
{
item
.
setAge
(
BeanDtoVoUtils
.
getAge
(
item
.
getBirthdayTime
()));
return
item
;
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireExpertsServiceImpl.java
View file @
1cff153b
...
...
@@ -7,17 +7,21 @@ import com.yeejoin.amos.boot.module.jcs.api.mapper.FireExpertsMapper;
import
com.yeejoin.amos.boot.module.jcs.api.service.IFireExpertsService
;
import
org.springframework.stereotype.Service
;
import
org.typroject.tyboot.core.rdbms.annotation.Condition
;
import
org.typroject.tyboot.core.rdbms.annotation.Operator
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
java.util.List
;
/**
* 服务实现类
*消防专家
* @author system_generator
* @date 2021-06-25
*/
* 服务实现类
* 消防专家
*
* @author system_generator
* @date 2021-06-25
*/
@Service
public
class
FireExpertsServiceImpl
extends
BaseService
<
FireExpertsDto
,
FireExperts
,
FireExpertsMapper
>
implements
IFireExpertsService
{
public
class
FireExpertsServiceImpl
extends
BaseService
<
FireExpertsDto
,
FireExperts
,
FireExpertsMapper
>
implements
IFireExpertsService
{
/**
* 分页查询
*/
...
...
@@ -28,7 +32,7 @@ public class FireExpertsServiceImpl extends BaseService<FireExpertsDto,FireExper
/**
* 列表查询 示例
*/
public
List
<
FireExpertsDto
>
queryForFireExpertsList
()
{
return
this
.
queryForList
(
""
,
fals
e
);
public
List
<
FireExpertsDto
>
queryForFireExpertsList
(
@Condition
(
Operator
.
eq
)
Boolean
isDelete
)
{
return
this
.
queryForList
(
""
,
false
,
isDelet
e
);
}
}
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/utils/BeanDtoVoUtils.java
View file @
1cff153b
...
...
@@ -7,6 +7,7 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.FireExperts;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.stereotype.Component
;
import
java.time.LocalDate
;
import
java.util.Calendar
;
import
java.util.Date
;
...
...
@@ -111,34 +112,23 @@ public class BeanDtoVoUtils {
});
}
//
由出生日期获得
年龄
//
根据LocalDate来计算
年龄
public
static
int
getAge
(
Date
birthDay
)
{
if
(
birthDay
==
null
)
{
if
(
birthDay
==
null
)
{
return
0
;
}
LocalDate
now
=
LocalDate
.
now
();
Calendar
cal
=
Calendar
.
getInstance
();
if
(
cal
.
before
(
birthDay
))
{
throw
new
IllegalArgumentException
(
"出生日期小于当前时间,无效的日期!"
);
}
int
yearNow
=
cal
.
get
(
Calendar
.
YEAR
);
int
monthNow
=
cal
.
get
(
Calendar
.
MONTH
);
int
dayOfMonthNow
=
cal
.
get
(
Calendar
.
DAY_OF_MONTH
);
cal
.
setTime
(
birthDay
);
int
yearBirth
=
cal
.
get
(
Calendar
.
YEAR
);
int
monthBirth
=
cal
.
get
(
Calendar
.
MONTH
);
int
monthBirth
=
cal
.
get
(
Calendar
.
MONTH
)
+
1
;
int
dayOfMonthBirth
=
cal
.
get
(
Calendar
.
DAY_OF_MONTH
);
int
age
=
yearNow
-
yearBirth
;
if
(
monthNow
<=
monthBirth
)
{
if
(
monthNow
==
monthBirth
)
{
if
(
dayOfMonthNow
<
dayOfMonthBirth
)
age
--;
}
else
{
age
--;
}
LocalDate
birth
=
LocalDate
.
of
(
yearBirth
,
monthBirth
,
dayOfMonthBirth
);
if
(
birth
.
isAfter
(
now
))
{
return
0
;
}
int
age
=
birth
.
until
(
now
).
getYears
();
return
age
;
}
...
...
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