Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit b1e7c906
authored
Jul 12, 2023
by
丁伟峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加了skillInfo的全表返回,以便前端予以展现
1 parent
528a3fe4
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
140 additions
and
0 deletions
project-order/src/main/java/com/dituhui/pea/order/controller/BusinessController.java
project-order/src/main/java/com/dituhui/pea/order/dao/SkillInfoDao.java
project-order/src/main/java/com/dituhui/pea/order/dto/BusinessSkillListDTO.java
project-order/src/main/java/com/dituhui/pea/order/service/BusinessBaseService.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessBaseServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/controller/BusinessController.java
View file @
b1e7c90
...
...
@@ -3,6 +3,7 @@ package com.dituhui.pea.order.controller;
import
com.dituhui.pea.common.BusinessException
;
import
com.dituhui.pea.common.Result
;
import
com.dituhui.pea.order.dto.*
;
import
com.dituhui.pea.order.service.BusinessBaseService
;
import
com.dituhui.pea.order.service.BusinessTeamService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.validation.annotation.Validated
;
...
...
@@ -15,6 +16,9 @@ public class BusinessController {
@Autowired
private
BusinessTeamService
businessTeamService
;
@Autowired
private
BusinessBaseService
businessBaseService
;
@GetMapping
(
"/business/team/list"
)
public
Result
<?>
getTeamList
(
@Validated
BusinessTeamsDTO
.
Request
reqDTO
)
{
Result
<?>
res
=
null
;
...
...
@@ -102,4 +106,15 @@ public class BusinessController {
}
return
res
;
}
@GetMapping
(
"/business/skill/list"
)
public
Result
<?>
getSkillList
(
@Validated
BusinessSkillListDTO
.
Request
reqDTO
)
{
Result
<?>
res
=
null
;
try
{
res
=
businessBaseService
.
getSkillList
(
reqDTO
);
}
catch
(
BusinessException
e
)
{
return
Result
.
failed
(
e
.
getMessage
());
}
return
res
;
}
}
project-order/src/main/java/com/dituhui/pea/order/dao/SkillInfoDao.java
View file @
b1e7c90
package
com
.
dituhui
.
pea
.
order
.
dao
;
import
com.dituhui.pea.order.entity.SkillInfoEntity
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.data.jpa.repository.JpaRepository
;
import
java.util.List
;
public
interface
SkillInfoDao
extends
JpaRepository
<
SkillInfoEntity
,
Long
>
{
List
<
SkillInfoEntity
>
findAll
();
Page
<
SkillInfoEntity
>
findAll
(
Pageable
pageable
);
}
project-order/src/main/java/com/dituhui/pea/order/dto/BusinessSkillListDTO.java
0 → 100644
View file @
b1e7c90
package
com
.
dituhui
.
pea
.
order
.
dto
;
import
lombok.experimental.Accessors
;
import
java.time.LocalDateTime
;
import
java.util.List
;
import
static
com
.
dituhui
.
pea
.
order
.
config
.
OrderConfig
.
DEFAULT_PAGE_SIZE
;
public
class
BusinessSkillListDTO
{
@lombok
.
Data
public
static
class
Request
{
private
Integer
size
=
DEFAULT_PAGE_SIZE
;
private
Integer
page
=
1
;
/**
* 服务分类,可选
*/
private
String
skillCategory
;
/**
* 产品分类,可选
*/
private
String
typeCategory
;
}
@lombok
.
Data
@Accessors
(
chain
=
true
)
public
static
class
Result
{
private
List
<
Content
>
content
;
private
long
pageCurrent
;
private
long
pages
;
private
long
pageSize
;
private
long
total
;
}
@lombok
.
Data
@Accessors
(
chain
=
true
)
public
static
class
Content
{
private
String
brand
;
private
LocalDateTime
createTime
;
private
Boolean
gasCert
;
private
Object
layerId
;
private
Boolean
lowElectricianCert
;
private
String
memo
;
private
Integer
priority
;
private
String
skill
;
private
String
skillCategory
;
private
String
skillCode
;
private
String
skillGroupCode
;
private
Integer
takeEngineer
;
private
Integer
takeTime
;
private
String
type
;
private
String
typeCategory
;
private
LocalDateTime
updateTime
;
}
}
project-order/src/main/java/com/dituhui/pea/order/service/BusinessBaseService.java
0 → 100644
View file @
b1e7c90
package
com
.
dituhui
.
pea
.
order
.
service
;
import
com.dituhui.pea.common.Result
;
import
com.dituhui.pea.order.dto.BusinessSkillListDTO
;
public
interface
BusinessBaseService
{
Result
<?>
getSkillList
(
BusinessSkillListDTO
.
Request
req
);
}
project-order/src/main/java/com/dituhui/pea/order/service/impl/BusinessBaseServiceImpl.java
0 → 100644
View file @
b1e7c90
package
com
.
dituhui
.
pea
.
order
.
service
.
impl
;
import
com.dituhui.pea.common.Result
;
import
com.dituhui.pea.order.dao.SkillInfoDao
;
import
com.dituhui.pea.order.dto.BusinessSkillListDTO
;
import
com.dituhui.pea.order.entity.SkillInfoEntity
;
import
com.dituhui.pea.order.service.BusinessBaseService
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.domain.Page
;
import
org.springframework.data.domain.PageRequest
;
import
org.springframework.data.domain.Pageable
;
import
org.springframework.stereotype.Service
;
import
java.util.List
;
import
java.util.stream.Collectors
;
@Service
@Slf4j
public
class
BusinessBaseServiceImpl
implements
BusinessBaseService
{
@Autowired
private
SkillInfoDao
skillInfoDao
;
@Override
public
Result
<?>
getSkillList
(
BusinessSkillListDTO
.
Request
req
)
{
Pageable
pageable
=
PageRequest
.
of
(
req
.
getPage
()
-
1
,
req
.
getSize
());
Page
<
SkillInfoEntity
>
page
=
skillInfoDao
.
findAll
(
pageable
);
List
<
BusinessSkillListDTO
.
Content
>
contents
=
page
.
getContent
().
stream
().
map
(
e
->{
return
new
BusinessSkillListDTO
.
Content
()
.
setSkillCode
(
e
.
getSkillCode
())
.
setBrand
(
e
.
getBrand
())
.
setType
(
e
.
getType
())
.
setSkill
(
e
.
getSkill
())
.
setTakeTime
(
e
.
getTakeTime
())
.
setTakeEngineer
(
e
.
getTakeEngineer
())
.
setLowElectricianCert
(
e
.
getLowElectricianCert
())
.
setGasCert
(
e
.
getGasCert
())
.
setPriority
(
e
.
getPriority
())
.
setSkillGroupCode
(
e
.
getSkillGroupCode
())
.
setLayerId
(
e
.
getLayerId
())
.
setTypeCategory
(
e
.
getTypeCategory
())
.
setSkillCategory
(
e
.
getSkillCategory
())
.
setMemo
(
e
.
getMemo
())
.
setCreateTime
(
e
.
getCreateTime
())
.
setUpdateTime
(
e
.
getUpdateTime
());
}).
collect
(
Collectors
.
toList
());
BusinessSkillListDTO
.
Result
rs
=
new
BusinessSkillListDTO
.
Result
();
rs
.
setTotal
(
page
.
getTotalElements
())
.
setPages
(
page
.
getTotalPages
())
.
setPageSize
(
page
.
getSize
())
.
setPageCurrent
(
page
.
getNumber
());
rs
.
setContent
(
contents
);
return
Result
.
success
(
rs
);
}
}
Write
Preview
Markdown
is supported
Attach a file
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 post a comment