Commit 965b7bdd authored by 王蔡翾's avatar 王蔡翾
Browse files

项目和考核

parent 4b7cd60c
...@@ -70,7 +70,6 @@ ...@@ -70,7 +70,6 @@
<version>${spring-boot.version}</version> <version>${spring-boot.version}</version>
<configuration> <configuration>
<mainClass>com.platform.projectassessment.ProjectAssessmentApplication</mainClass> <mainClass>com.platform.projectassessment.ProjectAssessmentApplication</mainClass>
<skip>true</skip>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
......
...@@ -120,7 +120,6 @@ ...@@ -120,7 +120,6 @@
<version>${spring-boot.version}</version> <version>${spring-boot.version}</version>
<configuration> <configuration>
<mainClass>com.platform.projectBusiness.ProjectBusinessApplication</mainClass> <mainClass>com.platform.projectBusiness.ProjectBusinessApplication</mainClass>
<skip>true</skip>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
......
...@@ -23,7 +23,7 @@ public class BsProjectController extends BaseController { ...@@ -23,7 +23,7 @@ public class BsProjectController extends BaseController {
@ApiOperation(value = "项目列表") @ApiOperation(value = "项目列表")
@PostMapping("/page") @PostMapping("/page")
public Result<List<BsProjectVO>> page(BsProjectDTO bsProjectDTO){ public Result<List<BsProjectVO>> page(@RequestBody BsProjectDTO bsProjectDTO){
return Result.data(bsProjectService.queryProjectList(bsProjectDTO)); return Result.data(bsProjectService.queryProjectList(bsProjectDTO));
} }
...@@ -34,4 +34,11 @@ public class BsProjectController extends BaseController { ...@@ -34,4 +34,11 @@ public class BsProjectController extends BaseController {
return Result.data(bsProjectService.geDetail(id)); return Result.data(bsProjectService.geDetail(id));
} }
@ApiOperation(value = "添加或修改项目")
@PostMapping("/add")
public Result<Boolean> addOrUpdate(@RequestBody BsProjectDTO bsProjectDTO){
return Result.data(bsProjectService.addProject(bsProjectDTO));
}
} }
...@@ -8,6 +8,7 @@ import com.platform.projectBusiness.service.BsProjectPeopleScoreService; ...@@ -8,6 +8,7 @@ import com.platform.projectBusiness.service.BsProjectPeopleScoreService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping; 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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -25,7 +26,7 @@ public class BsProjectPeopleScoreController extends BaseController { ...@@ -25,7 +26,7 @@ public class BsProjectPeopleScoreController extends BaseController {
@ApiOperation(value = "项目人员列表") @ApiOperation(value = "项目人员列表")
@PostMapping("/list") @PostMapping("/list")
public Result<List<BsProjectPeopleScoreVO>> list(BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO){ public Result<List<BsProjectPeopleScoreVO>> list( @RequestBody BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO){
return Result.data(bsProjectPeopleScoreService.qyeryProjectPeopleScoreList(bsProjectPeopleScoreDTO)); return Result.data(bsProjectPeopleScoreService.qyeryProjectPeopleScoreList(bsProjectPeopleScoreDTO));
} }
...@@ -33,13 +34,13 @@ public class BsProjectPeopleScoreController extends BaseController { ...@@ -33,13 +34,13 @@ public class BsProjectPeopleScoreController extends BaseController {
@ApiOperation(value = "添加项目人员") @ApiOperation(value = "添加项目人员")
@PostMapping("/add") @PostMapping("/add")
public Result<Boolean> add(BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO){ public Result<Boolean> add(@RequestBody BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO){
return Result.data(bsProjectPeopleScoreService.addProjectPeopleScore(bsProjectPeopleScoreDTO)); return Result.data(bsProjectPeopleScoreService.addProjectPeopleScore(bsProjectPeopleScoreDTO));
} }
@ApiOperation(value = "查看得分详情") @ApiOperation(value = "查看得分详情")
@PostMapping("/detail") @PostMapping("/detail")
public Result<BsProjectPeopleScoreVO> detail(BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO){ public Result<BsProjectPeopleScoreVO> detail(@RequestBody BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO){
return Result.data(bsProjectPeopleScoreService.getDetail(bsProjectPeopleScoreDTO)); return Result.data(bsProjectPeopleScoreService.getDetail(bsProjectPeopleScoreDTO));
} }
......
...@@ -11,6 +11,7 @@ import com.platform.projectBusiness.service.BsProjectPeopleScoreService; ...@@ -11,6 +11,7 @@ import com.platform.projectBusiness.service.BsProjectPeopleScoreService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping; 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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -28,7 +29,7 @@ public class BsProjectPeopleScoreDetailController extends BaseController { ...@@ -28,7 +29,7 @@ public class BsProjectPeopleScoreDetailController extends BaseController {
@ApiOperation(value = "考核打分") @ApiOperation(value = "考核打分")
@PostMapping("/mark") @PostMapping("/mark")
public Result<Boolean> list(List<BsProjectPeopleScoreDetailDTO> bsProjectPeopleScoreDetailDTOS){ public Result<Boolean> list(@RequestBody List<BsProjectPeopleScoreDetailDTO> bsProjectPeopleScoreDetailDTOS){
return Result.data(bsProjectPeopleScoreDetailService.updateScoresForForest(bsProjectPeopleScoreDetailDTOS)); return Result.data(bsProjectPeopleScoreDetailService.updateScoresForForest(bsProjectPeopleScoreDetailDTOS));
} }
......
...@@ -6,10 +6,7 @@ import com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO; ...@@ -6,10 +6,7 @@ import com.platform.projectBusiness.model.vo.BsProjectRoleAssessmentVO;
import com.platform.projectBusiness.service.BsProjectRoleAssessmentService; import com.platform.projectBusiness.service.BsProjectRoleAssessmentService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List; import java.util.List;
...@@ -25,21 +22,21 @@ public class BsProjectRoleAssessmentController extends BsProjectController{ ...@@ -25,21 +22,21 @@ public class BsProjectRoleAssessmentController extends BsProjectController{
@ApiOperation(value = "项目考核树形结构列表") @ApiOperation(value = "项目考核树形结构列表")
@PostMapping("/tree") @PostMapping("/tree")
public Result<List<BsProjectRoleAssessmentVO>> tree(BsProjectRoleAssessmentDTO bsProjectRoleAssessmentDTO) { public Result<List<BsProjectRoleAssessmentVO>> tree( @RequestBody BsProjectRoleAssessmentDTO bsProjectRoleAssessmentDTO) {
return Result.data(bsProjectRoleAssessmentService.queryListByProjectIdAndRole(bsProjectRoleAssessmentDTO)); return Result.data(bsProjectRoleAssessmentService.queryListByProjectIdAndRole(bsProjectRoleAssessmentDTO));
} }
@ApiOperation(value = "项目考核标准新增") @ApiOperation(value = "项目考核标准新增")
@PostMapping("/add") @PostMapping("/add")
public Result<Boolean> add(List<BsProjectRoleAssessmentDTO> assessmentDTOS){ public Result<Boolean> add(@RequestBody List<BsProjectRoleAssessmentDTO> assessmentDTOS){
return Result.data(bsProjectRoleAssessmentService.addAssessment(assessmentDTOS)); return Result.data(bsProjectRoleAssessmentService.addAssessment(assessmentDTOS));
} }
@ApiOperation(value = "项目考核标准更新") @ApiOperation(value = "项目考核标准更新")
@PutMapping("/update") @PutMapping("/update")
public Result<Boolean> update(List<BsProjectRoleAssessmentDTO> assessmentDTOS){ public Result<Boolean> update(@RequestBody List<BsProjectRoleAssessmentDTO> assessmentDTOS){
return Result.data(bsProjectRoleAssessmentService.updateBatchAssessment(assessmentDTOS)); return Result.data(bsProjectRoleAssessmentService.updateBatchAssessment(assessmentDTOS));
} }
} }
...@@ -30,7 +30,7 @@ public class SysDeptController extends BaseController { ...@@ -30,7 +30,7 @@ public class SysDeptController extends BaseController {
@ApiOperation(value = "新增或者修改") @ApiOperation(value = "新增或者修改")
@PostMapping("/addOrUpdate") @PostMapping("/addOrUpdate")
public Result<Boolean> addOrUpdate(SysDeptDTO sysDeptDTO) { public Result<Boolean> addOrUpdate(@RequestBody SysDeptDTO sysDeptDTO) {
return Result.data(sysDeptService.saveOrUpdate(sysDeptDTO)); return Result.data(sysDeptService.saveOrUpdate(sysDeptDTO));
} }
......
...@@ -24,7 +24,7 @@ public class SysRoleController extends BaseController { ...@@ -24,7 +24,7 @@ public class SysRoleController extends BaseController {
} }
@PostMapping("/add") @PostMapping("/add")
public Result<Boolean> add(SysRoleDTO sysRoleDTO){ public Result<Boolean> add(@RequestBody SysRoleDTO sysRoleDTO){
return Result.data(sysRoleService.saveOrUpdate(sysRoleDTO)); return Result.data(sysRoleService.saveOrUpdate(sysRoleDTO));
} }
......
...@@ -10,6 +10,7 @@ import com.platform.projectBusiness.service.SysUserService; ...@@ -10,6 +10,7 @@ import com.platform.projectBusiness.service.SysUserService;
import com.platform.projectBusiness.util.JwtUtil; import com.platform.projectBusiness.util.JwtUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -24,17 +25,19 @@ public class SysUserController extends BaseController { ...@@ -24,17 +25,19 @@ public class SysUserController extends BaseController {
@Resource @Resource
private JwtUtil jwtUtil; private JwtUtil jwtUtil;
private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
@PostMapping("/page") @PostMapping("/page")
@ApiOperation(value = "分页") @ApiOperation(value = "分页")
public TableDataInfo page(SysUserDTO sysUserDTO) { public TableDataInfo page(@RequestBody SysUserDTO sysUserDTO) {
startPage(sysUserDTO.getPageNum(), sysUserDTO.getPageSize()); startPage(sysUserDTO.getPageNum(), sysUserDTO.getPageSize());
return getDataTable(sysUserService.queryUserList(sysUserDTO)); return getDataTable(sysUserService.queryUserList(sysUserDTO));
} }
@ApiOperation(value = "新增用户") @ApiOperation(value = "新增用户")
@PostMapping("/addOrUpdate") @PostMapping("/addOrUpdate")
public Result<Boolean> add(SysUserDTO sysUserDTO){ public Result<Boolean> add(@RequestBody SysUserDTO sysUserDTO){
if (sysUserService.addOrUpdateUser(sysUserDTO)){ if (sysUserService.addOrUpdateUser(sysUserDTO)){
return Result.success("用户添加成功"); return Result.success("用户添加成功");
}else { }else {
...@@ -51,14 +54,14 @@ public class SysUserController extends BaseController { ...@@ -51,14 +54,14 @@ public class SysUserController extends BaseController {
@ApiOperation(value = "登录") @ApiOperation(value = "登录")
@PostMapping("/login") @PostMapping("/login")
public Result<LoginEntity> login(LoginEntity login){ public Result<LoginEntity> login(@RequestBody LoginEntity login){
return Result.data(sysUserService.login(login)); return Result.data(sysUserService.login(login));
} }
@ApiOperation(value = "获取当前用户信息") @ApiOperation(value = "获取当前用户信息")
@GetMapping("/getSelf") @GetMapping("/getSelf")
public Result<SysUserVO> getSelf(@RequestHeader("authorization") String token){ public Result<SysUserVO> getSelf(@RequestHeader("Authorization") String token){
SysUserDTO sysUserDTO = new SysUserDTO(); SysUserDTO sysUserDTO = new SysUserDTO();
String userName = jwtUtil.getUserNameFromToken(token); String userName = jwtUtil.getUserNameFromToken(token);
sysUserDTO.setUserName(userName); sysUserDTO.setUserName(userName);
...@@ -66,4 +69,11 @@ public class SysUserController extends BaseController { ...@@ -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));
}
} }
...@@ -32,7 +32,8 @@ public class JwtAuthFilter extends OncePerRequestFilter implements Ordered { ...@@ -32,7 +32,8 @@ public class JwtAuthFilter extends OncePerRequestFilter implements Ordered {
// 定义开放接口路径(支持通配符) // 定义开放接口路径(支持通配符)
private static final List<String> OPEN_API_PATHS = Arrays.asList( private static final List<String> OPEN_API_PATHS = Arrays.asList(
"/user/login" "/user/login",
"/user/register"
); );
@Override @Override
......
...@@ -14,5 +14,5 @@ public interface BsProjectService extends IService<BsProjectEntity> { ...@@ -14,5 +14,5 @@ public interface BsProjectService extends IService<BsProjectEntity> {
BsProjectVO geDetail(Integer projectId); BsProjectVO geDetail(Integer projectId);
@Transactional @Transactional
boolean addOrUpdateProject(BsProjectDTO bsProjectDTO); boolean addProject(BsProjectDTO bsProjectDTO);
} }
...@@ -98,11 +98,25 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject ...@@ -98,11 +98,25 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
@Transactional @Transactional
@Override @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 bsProjectPeopleScoreService.saveOrUpdateBatch(DozerUtils.convertList(bsProjectDTO.getBsProjectPeopleScoreDTOList(), BsProjectPeopleScoreEntity.class));
return saveOrUpdate(DozerUtils.convertBean(bsProjectDTO,BsProjectEntity.class));
} }
public BsProjectEntity addAndGetId(BsProjectEntity bsProjectEntity){
baseMapper.insert(bsProjectEntity);
return bsProjectEntity;
}
} }
...@@ -52,27 +52,47 @@ public class JwtUtil { ...@@ -52,27 +52,47 @@ public class JwtUtil {
/** /**
* 解析 Token 并直接返回 userName * 解析 Token 并直接返回 userName
* @param token JWT Token * @param token JWT Token(可以是原始token或带"Bearer "前缀的token)
* @return 用户名 * @return 用户名
* @throws RuntimeException 当 Token 无效或解析失败时抛出 * @throws RuntimeException 当 Token 无效或解析失败时抛出
*/ */
public String getUserNameFromToken(String token) { public String getUserNameFromToken(String token) {
try { try {
Claims claims = parseToken(token); // 预处理token,去除可能的空格和Bearer前缀
String userName = claims.get("userName", String.class); 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()) { if (userName == null || userName.isEmpty()) {
throw new RuntimeException("Token 中缺少 userName 字段"); throw new RuntimeException("Token 中缺少用户信息");
} }
return userName; return userName;
} catch (io.jsonwebtoken.ExpiredJwtException e) { } catch (io.jsonwebtoken.ExpiredJwtException e) {
throw new RuntimeException("Token 已过期"); throw new RuntimeException("Token 已过期");
} catch (io.jsonwebtoken.MalformedJwtException e) { } catch (io.jsonwebtoken.MalformedJwtException e) {
throw new RuntimeException("Token 格式错误"); throw new RuntimeException("Token 格式错误");
} catch (io.jsonwebtoken.SignatureException e) { } catch (io.jsonwebtoken.UnsupportedJwtException e) {
throw new RuntimeException("Token 签名无效");
} catch (io.jsonwebtoken.UnsupportedJwtException e) {
throw new RuntimeException("不支持的 Token 格式"); throw new RuntimeException("不支持的 Token 格式");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
throw new RuntimeException("Token 参数异常"); throw new RuntimeException("Token 参数异常");
...@@ -81,6 +101,7 @@ public class JwtUtil { ...@@ -81,6 +101,7 @@ public class JwtUtil {
} }
} }
/** /**
* 安全版本的解析方法,返回 null 而不是抛出异常 * 安全版本的解析方法,返回 null 而不是抛出异常
* @param token JWT Token * @param token JWT Token
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
on su.role_id = sr.id on su.role_id = sr.id
left join left join
sys_dept sd sys_dept sd
on sd.id = sr.dept_id on sd.id = su.dept_id
<where> <where>
<if test="userName != null and userName != ''"> <if test="userName != null and userName != ''">
user_name =#{userName} user_name =#{userName}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment