Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
王蔡翾
project_assessment
Commits
965b7bdd
Commit
965b7bdd
authored
Dec 09, 2025
by
王蔡翾
Browse files
项目和考核
parent
4b7cd60c
Changes
15
Show whitespace changes
Inline
Side-by-side
pom.xml
View file @
965b7bdd
...
...
@@ -70,7 +70,6 @@
<version>
${spring-boot.version}
</version>
<configuration>
<mainClass>
com.platform.projectassessment.ProjectAssessmentApplication
</mainClass>
<skip>
true
</skip>
</configuration>
<executions>
<execution>
...
...
project-business/pom.xml
View file @
965b7bdd
...
...
@@ -120,7 +120,6 @@
<version>
${spring-boot.version}
</version>
<configuration>
<mainClass>
com.platform.projectBusiness.ProjectBusinessApplication
</mainClass>
<skip>
true
</skip>
</configuration>
<executions>
<execution>
...
...
project-business/src/main/java/com/platform/projectBusiness/controller/BsProjectController.java
View file @
965b7bdd
...
...
@@ -23,7 +23,7 @@ public class BsProjectController extends BaseController {
@ApiOperation
(
value
=
"项目列表"
)
@PostMapping
(
"/page"
)
public
Result
<
List
<
BsProjectVO
>>
page
(
BsProjectDTO
bsProjectDTO
){
public
Result
<
List
<
BsProjectVO
>>
page
(
@RequestBody
BsProjectDTO
bsProjectDTO
){
return
Result
.
data
(
bsProjectService
.
queryProjectList
(
bsProjectDTO
));
}
...
...
@@ -34,4 +34,11 @@ public class BsProjectController extends BaseController {
return
Result
.
data
(
bsProjectService
.
geDetail
(
id
));
}
@ApiOperation
(
value
=
"添加或修改项目"
)
@PostMapping
(
"/add"
)
public
Result
<
Boolean
>
addOrUpdate
(
@RequestBody
BsProjectDTO
bsProjectDTO
){
return
Result
.
data
(
bsProjectService
.
addProject
(
bsProjectDTO
));
}
}
project-business/src/main/java/com/platform/projectBusiness/controller/BsProjectPeopleScoreController.java
View file @
965b7bdd
...
...
@@ -8,6 +8,7 @@ import com.platform.projectBusiness.service.BsProjectPeopleScoreService;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
...
...
@@ -25,7 +26,7 @@ public class BsProjectPeopleScoreController extends BaseController {
@ApiOperation
(
value
=
"项目人员列表"
)
@PostMapping
(
"/list"
)
public
Result
<
List
<
BsProjectPeopleScoreVO
>>
list
(
BsProjectPeopleScoreDTO
bsProjectPeopleScoreDTO
){
public
Result
<
List
<
BsProjectPeopleScoreVO
>>
list
(
@RequestBody
BsProjectPeopleScoreDTO
bsProjectPeopleScoreDTO
){
return
Result
.
data
(
bsProjectPeopleScoreService
.
qyeryProjectPeopleScoreList
(
bsProjectPeopleScoreDTO
));
}
...
...
@@ -33,13 +34,13 @@ public class BsProjectPeopleScoreController extends BaseController {
@ApiOperation
(
value
=
"添加项目人员"
)
@PostMapping
(
"/add"
)
public
Result
<
Boolean
>
add
(
BsProjectPeopleScoreDTO
bsProjectPeopleScoreDTO
){
public
Result
<
Boolean
>
add
(
@RequestBody
BsProjectPeopleScoreDTO
bsProjectPeopleScoreDTO
){
return
Result
.
data
(
bsProjectPeopleScoreService
.
addProjectPeopleScore
(
bsProjectPeopleScoreDTO
));
}
@ApiOperation
(
value
=
"查看得分详情"
)
@PostMapping
(
"/detail"
)
public
Result
<
BsProjectPeopleScoreVO
>
detail
(
BsProjectPeopleScoreDTO
bsProjectPeopleScoreDTO
){
public
Result
<
BsProjectPeopleScoreVO
>
detail
(
@RequestBody
BsProjectPeopleScoreDTO
bsProjectPeopleScoreDTO
){
return
Result
.
data
(
bsProjectPeopleScoreService
.
getDetail
(
bsProjectPeopleScoreDTO
));
}
...
...
project-business/src/main/java/com/platform/projectBusiness/controller/BsProjectPeopleScoreDetailController.java
View file @
965b7bdd
...
...
@@ -11,6 +11,7 @@ import com.platform.projectBusiness.service.BsProjectPeopleScoreService;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
...
...
@@ -28,7 +29,7 @@ public class BsProjectPeopleScoreDetailController extends BaseController {
@ApiOperation
(
value
=
"考核打分"
)
@PostMapping
(
"/mark"
)
public
Result
<
Boolean
>
list
(
List
<
BsProjectPeopleScoreDetailDTO
>
bsProjectPeopleScoreDetailDTOS
){
public
Result
<
Boolean
>
list
(
@RequestBody
List
<
BsProjectPeopleScoreDetailDTO
>
bsProjectPeopleScoreDetailDTOS
){
return
Result
.
data
(
bsProjectPeopleScoreDetailService
.
updateScoresForForest
(
bsProjectPeopleScoreDetailDTOS
));
}
...
...
project-business/src/main/java/com/platform/projectBusiness/controller/BsProjectRoleAssessmentController.java
View file @
965b7bdd
...
...
@@ -6,10 +6,7 @@ import com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO;
import
com.platform.projectBusiness.service.BsProjectRoleAssessmentService
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PutMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
import
java.util.List
;
...
...
@@ -25,21 +22,21 @@ public class BsProjectRoleAssessmentController extends BsProjectController{
@ApiOperation
(
value
=
"项目考核树形结构列表"
)
@PostMapping
(
"/tree"
)
public
Result
<
List
<
BsProjectRoleAssessmentVO
>>
tree
(
BsProjectRoleAssessmentDTO
bsProjectRoleAssessmentDTO
)
{
public
Result
<
List
<
BsProjectRoleAssessmentVO
>>
tree
(
@RequestBody
BsProjectRoleAssessmentDTO
bsProjectRoleAssessmentDTO
)
{
return
Result
.
data
(
bsProjectRoleAssessmentService
.
queryListByProjectIdAndRole
(
bsProjectRoleAssessmentDTO
));
}
@ApiOperation
(
value
=
"项目考核标准新增"
)
@PostMapping
(
"/add"
)
public
Result
<
Boolean
>
add
(
List
<
BsProjectRoleAssessmentDTO
>
assessmentDTOS
){
public
Result
<
Boolean
>
add
(
@RequestBody
List
<
BsProjectRoleAssessmentDTO
>
assessmentDTOS
){
return
Result
.
data
(
bsProjectRoleAssessmentService
.
addAssessment
(
assessmentDTOS
));
}
@ApiOperation
(
value
=
"项目考核标准更新"
)
@PutMapping
(
"/update"
)
public
Result
<
Boolean
>
update
(
List
<
BsProjectRoleAssessmentDTO
>
assessmentDTOS
){
public
Result
<
Boolean
>
update
(
@RequestBody
List
<
BsProjectRoleAssessmentDTO
>
assessmentDTOS
){
return
Result
.
data
(
bsProjectRoleAssessmentService
.
updateBatchAssessment
(
assessmentDTOS
));
}
}
project-business/src/main/java/com/platform/projectBusiness/controller/SysDeptController.java
View file @
965b7bdd
...
...
@@ -30,7 +30,7 @@ public class SysDeptController extends BaseController {
@ApiOperation
(
value
=
"新增或者修改"
)
@PostMapping
(
"/addOrUpdate"
)
public
Result
<
Boolean
>
addOrUpdate
(
SysDeptDTO
sysDeptDTO
)
{
public
Result
<
Boolean
>
addOrUpdate
(
@RequestBody
SysDeptDTO
sysDeptDTO
)
{
return
Result
.
data
(
sysDeptService
.
saveOrUpdate
(
sysDeptDTO
));
}
...
...
project-business/src/main/java/com/platform/projectBusiness/controller/SysRoleController.java
View file @
965b7bdd
...
...
@@ -24,7 +24,7 @@ public class SysRoleController extends BaseController {
}
@PostMapping
(
"/add"
)
public
Result
<
Boolean
>
add
(
SysRoleDTO
sysRoleDTO
){
public
Result
<
Boolean
>
add
(
@RequestBody
SysRoleDTO
sysRoleDTO
){
return
Result
.
data
(
sysRoleService
.
saveOrUpdate
(
sysRoleDTO
));
}
...
...
project-business/src/main/java/com/platform/projectBusiness/controller/SysUserController.java
View file @
965b7bdd
...
...
@@ -10,6 +10,7 @@ import com.platform.projectBusiness.service.SysUserService;
import
com.platform.projectBusiness.util.JwtUtil
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
;
import
org.springframework.web.bind.annotation.*
;
import
javax.annotation.Resource
;
...
...
@@ -24,17 +25,19 @@ public class SysUserController extends BaseController {
@Resource
private
JwtUtil
jwtUtil
;
private
final
BCryptPasswordEncoder
passwordEncoder
=
new
BCryptPasswordEncoder
();
@PostMapping
(
"/page"
)
@ApiOperation
(
value
=
"分页"
)
public
TableDataInfo
page
(
SysUserDTO
sysUserDTO
)
{
public
TableDataInfo
page
(
@RequestBody
SysUserDTO
sysUserDTO
)
{
startPage
(
sysUserDTO
.
getPageNum
(),
sysUserDTO
.
getPageSize
());
return
getDataTable
(
sysUserService
.
queryUserList
(
sysUserDTO
));
}
@ApiOperation
(
value
=
"新增用户"
)
@PostMapping
(
"/addOrUpdate"
)
public
Result
<
Boolean
>
add
(
SysUserDTO
sysUserDTO
){
public
Result
<
Boolean
>
add
(
@RequestBody
SysUserDTO
sysUserDTO
){
if
(
sysUserService
.
addOrUpdateUser
(
sysUserDTO
)){
return
Result
.
success
(
"用户添加成功"
);
}
else
{
...
...
@@ -51,14 +54,14 @@ public class SysUserController extends BaseController {
@ApiOperation
(
value
=
"登录"
)
@PostMapping
(
"/login"
)
public
Result
<
LoginEntity
>
login
(
LoginEntity
login
){
public
Result
<
LoginEntity
>
login
(
@RequestBody
LoginEntity
login
){
return
Result
.
data
(
sysUserService
.
login
(
login
));
}
@ApiOperation
(
value
=
"获取当前用户信息"
)
@GetMapping
(
"/getSelf"
)
public
Result
<
SysUserVO
>
getSelf
(
@RequestHeader
(
"
a
uthorization"
)
String
token
){
public
Result
<
SysUserVO
>
getSelf
(
@RequestHeader
(
"
A
uthorization"
)
String
token
){
SysUserDTO
sysUserDTO
=
new
SysUserDTO
();
String
userName
=
jwtUtil
.
getUserNameFromToken
(
token
);
sysUserDTO
.
setUserName
(
userName
);
...
...
@@ -66,4 +69,11 @@ public class SysUserController extends BaseController {
}
@ApiOperation
(
value
=
"注册"
)
@PostMapping
(
"/register"
)
public
Result
<
Boolean
>
register
(
@RequestBody
SysUserDTO
sysUserDTO
){
return
Result
.
data
(
sysUserService
.
addOrUpdateUser
(
sysUserDTO
));
}
}
project-business/src/main/java/com/platform/projectBusiness/filter/JwtAuthFilter.java
View file @
965b7bdd
...
...
@@ -32,7 +32,8 @@ public class JwtAuthFilter extends OncePerRequestFilter implements Ordered {
// 定义开放接口路径(支持通配符)
private
static
final
List
<
String
>
OPEN_API_PATHS
=
Arrays
.
asList
(
"/user/login"
"/user/login"
,
"/user/register"
);
@Override
...
...
project-business/src/main/java/com/platform/projectBusiness/service/BsProjectService.java
View file @
965b7bdd
...
...
@@ -14,5 +14,5 @@ public interface BsProjectService extends IService<BsProjectEntity> {
BsProjectVO
geDetail
(
Integer
projectId
);
@Transactional
boolean
add
OrUpdate
Project
(
BsProjectDTO
bsProjectDTO
);
boolean
addProject
(
BsProjectDTO
bsProjectDTO
);
}
project-business/src/main/java/com/platform/projectBusiness/service/impl/BsProjectServiceImpl.java
View file @
965b7bdd
...
...
@@ -98,11 +98,25 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
@Transactional
@Override
public
boolean
addOrUpdateProject
(
BsProjectDTO
bsProjectDTO
){
public
boolean
addProject
(
BsProjectDTO
bsProjectDTO
){
//添加项目并获取id
BsProjectEntity
bsProjectEntity
=
DozerUtils
.
convertBean
(
bsProjectDTO
,
BsProjectEntity
.
class
);
bsProjectEntity
=
addAndGetId
(
bsProjectEntity
);
for
(
BsProjectPeopleScoreDTO
bsProjectPeopleScoreDTO
:
bsProjectDTO
.
getBsProjectPeopleScoreDTOList
()){
bsProjectPeopleScoreDTO
.
setProjectId
(
bsProjectEntity
.
getId
());
}
//添加项目成员和得分
bsProjectPeopleScoreService
.
saveBatch
(
DozerUtils
.
convertList
(
bsProjectDTO
.
getBsProjectPeopleScoreDTOList
(),
BsProjectPeopleScoreEntity
.
class
));
return
saveOrUpdate
(
DozerUtils
.
convertBean
(
bsProjectDTO
,
BsProjectEntity
.
class
));
return
bsProjectPeopleScoreService
.
save
OrUpdate
Batch
(
DozerUtils
.
convertList
(
bsProjectDTO
.
getBsProjectPeopleScoreDTOList
(),
BsProjectPeopleScoreEntity
.
class
));
}
public
BsProjectEntity
addAndGetId
(
BsProjectEntity
bsProjectEntity
){
baseMapper
.
insert
(
bsProjectEntity
);
return
bsProjectEntity
;
}
}
project-business/src/main/java/com/platform/projectBusiness/util/JwtUtil.java
View file @
965b7bdd
...
...
@@ -52,26 +52,46 @@ public class JwtUtil {
/**
* 解析 Token 并直接返回 userName
* @param token JWT Token
* @param token JWT Token
(可以是原始token或带"Bearer "前缀的token)
* @return 用户名
* @throws RuntimeException 当 Token 无效或解析失败时抛出
*/
public
String
getUserNameFromToken
(
String
token
)
{
try
{
Claims
claims
=
parseToken
(
token
);
// 预处理token,去除可能的空格和Bearer前缀
if
(
token
!=
null
)
{
token
=
token
.
trim
();
if
(
token
.
startsWith
(
"Bearer "
))
{
token
=
token
.
substring
(
7
).
trim
();
}
}
// 检查token是否为空
if
(
token
==
null
||
token
.
isEmpty
())
{
throw
new
RuntimeException
(
"Token 不能为空"
);
}
// 修改后代码:
SecretKey
key
=
Keys
.
hmacShaKeyFor
(
secret
.
getBytes
());
Claims
claims
=
Jwts
.
parserBuilder
()
.
setSigningKey
(
key
)
.
build
()
.
parseClaimsJws
(
token
)
.
getBody
();
// 优先从subject获取,如果没有则从userName字段获取
String
userName
=
claims
.
get
(
"userName"
,
String
.
class
);
if
(
userName
==
null
||
userName
.
trim
().
isEmpty
())
{
throw
new
RuntimeException
(
"Token 中缺少
userName 字段
"
);
if
(
userName
==
null
||
userName
.
isEmpty
())
{
throw
new
RuntimeException
(
"Token 中缺少
用户信息
"
);
}
return
userName
;
}
catch
(
io
.
jsonwebtoken
.
ExpiredJwtException
e
)
{
throw
new
RuntimeException
(
"Token 已过期"
);
}
catch
(
io
.
jsonwebtoken
.
MalformedJwtException
e
)
{
throw
new
RuntimeException
(
"Token 格式错误"
);
}
catch
(
io
.
jsonwebtoken
.
SignatureException
e
)
{
throw
new
RuntimeException
(
"Token 签名无效"
);
}
catch
(
io
.
jsonwebtoken
.
UnsupportedJwtException
e
)
{
throw
new
RuntimeException
(
"不支持的 Token 格式"
);
}
catch
(
IllegalArgumentException
e
)
{
...
...
@@ -81,6 +101,7 @@ public class JwtUtil {
}
}
/**
* 安全版本的解析方法,返回 null 而不是抛出异常
* @param token JWT Token
...
...
project-business/src/main/resources/mapper/SysRolePermission.xml
→
project-business/src/main/resources/mapper/SysRolePermission
Mapper
.xml
View file @
965b7bdd
File moved
project-business/src/main/resources/mapper/SysUserMapper.xml
View file @
965b7bdd
...
...
@@ -19,7 +19,7 @@
on su.role_id = sr.id
left join
sys_dept sd
on sd.id = s
r
.dept_id
on sd.id = s
u
.dept_id
<where>
<if
test=
"userName != null and userName != ''"
>
user_name =#{userName}
...
...
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