Commit 62cef19d authored by 王蔡翾's avatar 王蔡翾
Browse files

oa账户适配以及bug修复

parent 43a24fcb
......@@ -2,9 +2,11 @@ package com.platform.projectBusiness.controller;
import com.platform.controller.BaseController;
import com.platform.model.resp.Result;
import com.platform.page.TableDataInfo;
import com.platform.projectBusiness.model.dto.BsProjectDTO;
import com.platform.projectBusiness.model.vo.BsProjectVO;
import com.platform.projectBusiness.service.BsProjectService;
import com.platform.projectBusiness.util.JwtUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
......@@ -19,12 +21,17 @@ public class BsProjectController extends BaseController {
@Resource
private BsProjectService bsProjectService;
@Resource
private JwtUtil jwtUtil;
@ApiOperation(value = "项目列表")
@PostMapping("/page")
public Result<List<BsProjectVO>> page(@RequestBody BsProjectDTO bsProjectDTO){
return Result.data(bsProjectService.queryProjectList(bsProjectDTO));
public Result<TableDataInfo> page(@RequestBody BsProjectDTO bsProjectDTO, @RequestHeader("Authorization") String token){
String name = jwtUtil.getUserNameFromToken(token);
bsProjectDTO.setLoginUser(name);
startPage(bsProjectDTO.getPageNum(), bsProjectDTO.getPageSize());
return Result.data(getDataTable(bsProjectService.queryProjectList(bsProjectDTO)));
}
......@@ -35,7 +42,7 @@ public class BsProjectController extends BaseController {
}
@ApiOperation(value = "添加或修改项目")
@ApiOperation(value = "添加")
@PostMapping("/add")
public Result<Boolean> addOrUpdate(@RequestBody BsProjectDTO bsProjectDTO){
return Result.data(bsProjectService.addProject(bsProjectDTO));
......
......@@ -37,7 +37,7 @@ public class SysDeptController extends BaseController {
@ApiOperation(value = "删除")
@DeleteMapping("/delete/{id}")
public Result<Boolean> delete(@PathVariable Integer id) {
public Result<Boolean> delete(@PathVariable String id) {
return Result.data(sysDeptService.removeById(id));
}
}
......@@ -38,7 +38,7 @@ public class SysUserController extends BaseController {
@ApiOperation(value = "新增用户")
@PostMapping("/addOrUpdate")
public Result<Boolean> add(@RequestBody SysUserDTO sysUserDTO){
if (sysUserService.addOrUpdateUser(sysUserDTO)){
if (sysUserService.save(sysUserDTO)){
return Result.success("用户添加成功");
}else {
return Result.fail("账号重复请重新添加");
......@@ -47,7 +47,7 @@ public class SysUserController extends BaseController {
@ApiOperation(value = "删除用户")
@DeleteMapping("/delete/{id}")
public Result<Boolean> delete(@PathVariable Integer id) {
public Result<Boolean> delete(@PathVariable String id) {
return Result.data(sysUserService.removeById(id));
}
......@@ -63,8 +63,8 @@ public class SysUserController extends BaseController {
@GetMapping("/getSelf")
public Result<SysUserVO> getSelf(@RequestHeader("Authorization") String token){
SysUserDTO sysUserDTO = new SysUserDTO();
String userName = jwtUtil.getUserNameFromToken(token);
sysUserDTO.setUserName(userName);
String name = jwtUtil.getUserNameFromToken(token);
sysUserDTO.setName(name);
return Result.data(sysUserService.getSelf(sysUserDTO));
}
......
......@@ -73,10 +73,10 @@ public class JwtAuthFilter extends OncePerRequestFilter implements Ordered {
var claims = jwtUtil.parseToken(token);
// 5. 从 Token 中提取用户身份信息(根据你生成时的 claims 名称)
String userName = claims.get("userName", String.class); // 你生成时放入的 key
String userName = claims.get("name", String.class); // 你生成时放入的 key
if (userName == null) {
log.warn("[JWT 校验失败] Token 中缺少 userName");
log.warn("[JWT 校验失败] Token 中缺少 name");
sendUnauthorized(response, "无效的用户身份信息");
return;
}
......
......@@ -17,6 +17,9 @@ public class BsProjectDTO extends BsProjectEntity {
@ApiModelProperty(value = "每页显示的数量", example = "10")
private Integer pageSize;
@ApiModelProperty(value = "当前登陆人")
private String loginUser;
@ApiModelProperty(value = "项目成员列表")
private List<BsProjectPeopleScoreDTO> bsProjectPeopleScoreDTOList;
......
......@@ -15,7 +15,7 @@ public class BsProjectPeopleScoreDetailEntity {
@TableField(value = "project_id")
private Integer projectId;
@TableField(value = "project_people")
private Integer projectPeople;
private String projectPeople;
@TableField(value = "assessment_description")
private String assessmentDescription;
@TableField(value = "assessment_standard")
......
......@@ -20,11 +20,11 @@ public class BsProjectPeopleScoreEntity {
private String projectRole;
@ApiModelProperty(value = "项目人员id")
@TableField(value = "project_people")
private Integer projectPeople;
private String projectPeople;
@ApiModelProperty(value = "项目人员得分")
@TableField(value = "score")
private Double score;
@TableField(value = "状态")
@TableField(value = "status")
@ApiModelProperty(value = "状态")
private String status;
}
......@@ -11,10 +11,10 @@ public class LoginEntity {
private String token;
@ApiModelProperty(value = "用户ID")
private Integer userId;
private String userId;
@ApiModelProperty(value = "用户名")
private String userName;
private String name;
@ApiModelProperty(value = "密码")
private String password;
......
......@@ -4,19 +4,19 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@TableName("sys_dept")
@TableName("dept")
@Data
public class SysDeptEntity {
@TableId(type = IdType.AUTO)
private Integer id;
private String id;
@TableField("name")
private String name;
@TableField("parent_id")
private Integer parentId;
@TableField("dept_admin")
@ApiModelProperty(value = "部门管理员")
private String deptAdmin;
@TableField("sort_order")
private Integer sortOrder;
}
......@@ -4,26 +4,83 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
@TableName("sys_user")
import java.util.Date;
@TableName("user")
@Data
public class SysUserEntity {
@TableId(type = IdType.AUTO)
private Integer id;
@TableField("user_name")
private String userName;
@TableField("password")
private String password;
@TableField("nick_name")
private String nickName;
@TableId(type = IdType.ASSIGN_ID)
private String id;
private String name;
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
@TableField("phone")
private String phone;
@TableField("id_card")
private String idCard;
@TableField("fn")
private String fn;
@TableField("work_no")
private String workNo;
@TableField("sex")
private Integer sex;
@TableField("birth_date")
private String birthDate;
@TableField("birth")
private String birth;
@TableField("age")
private Integer age;
@TableField("nation")
private String nation;
@TableField("company_name")
private String companyName;
@TableField("post")
private String post;
@TableField("post_rank")
private String postRank;
@TableField("sequence")
private String sequence;
@TableField("join_date")
private Date joinDate;
@TableField("second_dept")
private String secondDept;
@TableField("third_dept")
private String thirdDept;
@TableField("password")
private String password;
@TableField("email")
private String email;
@TableField("user_role")
private String userRole;
@TableField("dept_id")
private Integer deptId;
private String deptId;
@TableField("role_id")
private Integer roleId;
}
......@@ -19,4 +19,7 @@ public class BsProjectPeopleScoreVO extends BsProjectPeopleScoreEntity {
private String completeRate;
@ApiModelProperty(value = "项目人员考核项数量占比")
private String proportion;
@ApiModelProperty
private String nickName;
}
......@@ -25,7 +25,7 @@ public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProject
@Override
public List<BsProjectPeopleScoreDetailVO> queryProjectPeopleScoreDetailList(BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO){
// 1. 查询成员得分详情数据
List<BsProjectPeopleScoreDetailVO> bsProjectPeopleScoreDetailVOS = baseMapper.queryProjectPeopleScoreDetailList(bsProjectPeopleScoreDetailDTO);
return baseMapper.queryProjectPeopleScoreDetailList(bsProjectPeopleScoreDetailDTO);
}
......@@ -50,7 +50,7 @@ public class BsProjectPeopleScoreDetailServiceImpl extends ServiceImpl<BsProject
@Override
public boolean addProjectPeopleScoreDetail(BsProjectPeopleScoreDetailDTO bsProjectPeopleScoreDetailDTO){
Integer projectId = bsProjectPeopleScoreDetailDTO.getProjectId();
Integer projectPeople = bsProjectPeopleScoreDetailDTO.getProjectPeople();
String projectPeople = bsProjectPeopleScoreDetailDTO.getProjectPeople();
// 查询项目角色考核
BsProjectRoleAssessmentDTO bsProjectRoleAssessmentDTO = new BsProjectRoleAssessmentDTO();
......
......@@ -9,8 +9,6 @@ import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO;
import com.platform.projectBusiness.model.vo.BsProjectPeopleScoreVO;
import com.platform.projectBusiness.service.BsProjectPeopleScoreDetailService;
import com.platform.projectBusiness.service.BsProjectPeopleScoreService;
import com.platform.utils.DozerUtils;
import com.platform.utils.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
......@@ -60,7 +58,7 @@ public class BsProjectPeopleScoreServiceImpl extends ServiceImpl<BsProjectPeople
// 2. 构建树形结构
List<BsProjectPeopleScoreDetailVO> result = new ArrayList<>();
for (BsProjectPeopleScoreDetailVO bsProjectPeopleScoreDetailVO : sysDeptVOS) {
if (StringUtils.isEmpty(Collections.singleton(bsProjectPeopleScoreDetailVO.getParentId()))) {//修改
if (bsProjectPeopleScoreDetailVO.getParentId()==null) {//修改
// 顶级节点
result.add(bsProjectPeopleScoreDetailVO);
} else {
......@@ -87,15 +85,21 @@ public class BsProjectPeopleScoreServiceImpl extends ServiceImpl<BsProjectPeople
bsProjectPeopleScoreDetailDTO.setProjectPeople(bsProjectPeopleScoreDTO.getProjectPeople());
List<BsProjectPeopleScoreDetailVO> bsProjectPeopleScoreDetailVOS = bsProjectPeopleScoreDetailService.queryProjectPeopleScoreDetailList(bsProjectPeopleScoreDetailDTO);
// 查询项目人员得分
BsProjectPeopleScoreEntity bsProjectPeopleScoreEntity = getById(bsProjectPeopleScoreDTO.getId());
BsProjectPeopleScoreVO bsProjectPeopleScoreVO = DozerUtils.convertBean(bsProjectPeopleScoreEntity,BsProjectPeopleScoreVO.class);
List<BsProjectPeopleScoreVO> bsProjectPeopleScoreVOS = qyeryProjectPeopleScoreList(bsProjectPeopleScoreDTO);
BsProjectPeopleScoreVO bsProjectPeopleScoreVO = new BsProjectPeopleScoreVO();
if (!bsProjectPeopleScoreVOS.isEmpty()){
bsProjectPeopleScoreVO = bsProjectPeopleScoreVOS.get(0);
}
// 构建树形结构并赋值
bsProjectPeopleScoreVO.setBsProjectPeopleScoreDetailVOList(buildTree(bsProjectPeopleScoreDetailVOS));
//求出总得分
Double totalScore = 0.0;
double totalScore = 0.0;
for (BsProjectPeopleScoreDetailVO bsProjectPeopleScoreDetailVO : bsProjectPeopleScoreDetailVOS){
if (bsProjectPeopleScoreDetailVO.getParentId() == null){
totalScore += bsProjectPeopleScoreDetailVO.getScore();
if (bsProjectPeopleScoreDetailVO.getScore()!=null) {
totalScore += bsProjectPeopleScoreDetailVO.getScore();
}
}
}
bsProjectPeopleScoreVO.setScore(totalScore);
......
......@@ -50,7 +50,7 @@ public class BsProjectRoleAssessmentServiceImpl extends ServiceImpl<BsProjectRol
// 2. 构建树形结构
List<BsProjectRoleAssessmentVO> result = new ArrayList<>();
for (BsProjectRoleAssessmentVO bsProjectRoleAssessmentVO : bsProjectRoleAssessmentVOS) {
if (StringUtils.isEmpty(Collections.singleton(bsProjectRoleAssessmentVO.getParentId()))) {//修改
if (bsProjectRoleAssessmentVO.getParentId()==null) {//修改
// 顶级节点
result.add(bsProjectRoleAssessmentVO);
} else {
......
......@@ -38,14 +38,26 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
*/
@Override
public List<BsProjectVO> queryProjectList(BsProjectDTO bsProjectDTO){
String loginUser = bsProjectDTO.getLoginUser() ;
List<BsProjectVO> bsProjectVOList = baseMapper.queryProjectList(bsProjectDTO);
// 添加空值检查
if (bsProjectVOList == null) {
return new ArrayList<>(); // 返回空列表而不是null
}
List<BsProjectVO> bsProjectVOList1 = new ArrayList<>();
//只保留自己相关的项目
for (BsProjectVO bsProjectVO : bsProjectVOList){
BsProjectPeopleScoreDTO bsProjectPeopleScoreDTO = new BsProjectPeopleScoreDTO();
bsProjectPeopleScoreDTO.setProjectId(bsProjectVO.getId());
bsProjectPeopleScoreDTO.setProjectPeople(loginUser);
List<BsProjectPeopleScoreVO> bsProjectPeopleScoreVOList = bsProjectPeopleScoreService.qyeryProjectPeopleScoreList(bsProjectPeopleScoreDTO);
if (bsProjectPeopleScoreVOList != null && !bsProjectPeopleScoreVOList.isEmpty()){
bsProjectVOList1.add(bsProjectVO);
}
}
for (BsProjectVO bsProjectVO : bsProjectVOList1){
// 添加空值检查
if (bsProjectVO == null) {
continue;
......@@ -60,27 +72,32 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
// 根据周期判断状态
if (LocalDate.now().isAfter(createTime)
&& LocalDate.now().isBefore(bsProjectVO.getStartTime())){
bsProjectVO.setStatus("立项中");
}
// 根据周期判断状态 - 添加等于条件处理
if (LocalDate.now().isAfter(bsProjectVO.getStartTime())
&& LocalDate.now().isBefore(bsProjectVO.getDeliveryDate())){
// 判断是否已完结(优先级最高)
if (LocalDate.now().isAfter(bsProjectVO.getDeliveryDate())
|| LocalDate.now().isEqual(bsProjectVO.getDeliveryDate())) {
bsProjectVO.setStatus("已完结");
}
// 判断是否进行中(在开始时间之后或等于,且在交付时间之前)
else if ((LocalDate.now().isAfter(bsProjectVO.getStartTime())
|| LocalDate.now().isEqual(bsProjectVO.getStartTime()))
&& LocalDate.now().isBefore(bsProjectVO.getDeliveryDate())) {
bsProjectVO.setStatus("进行中");
}
if (LocalDate.now().isAfter(bsProjectVO.getDeliveryDate())){
bsProjectVO.setStatus("已完结");
// 判断是否立项中(在创建时间之后或等于,且在开始时间之前)
else if (LocalDate.now().isAfter(createTime)
|| LocalDate.now().isEqual(createTime)) {
bsProjectVO.setStatus("立项中");
}
// 保存前检查转换结果
BsProjectEntity entity = DozerUtils.convertBean(bsProjectVO, BsProjectEntity.class);
if (entity != null) {
save(entity);
updateById(entity);
}
}
return bsProjectVOList;
return bsProjectVOList1;
}
......@@ -128,6 +145,7 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
@Transactional
@Override
public boolean addProject(BsProjectDTO bsProjectDTO){
bsProjectDTO.setCreateTime(LocalDate.now());
//添加项目并获取id
BsProjectEntity bsProjectEntity = DozerUtils.convertBean(bsProjectDTO,BsProjectEntity.class);
bsProjectEntity = addAndGetId(bsProjectEntity);
......@@ -147,5 +165,17 @@ public class BsProjectServiceImpl extends ServiceImpl<BsProjectMapper, BsProject
}
// @Override
// public boolean updateProject(BsProjectDTO bsProjectDTO){
// //添加项目并获取id
// BsProjectEntity bsProjectEntity = DozerUtils.convertBean(bsProjectDTO,BsProjectEntity.class);
// updateById(bsProjectEntity);
//
// //更新项目成员和得分
// return bsProjectPeopleScoreService.saveOrUpdateBatch(DozerUtils.convertList(bsProjectDTO.getBsProjectPeopleScoreDTOList(), BsProjectPeopleScoreEntity.class));
//
// }
}
......@@ -19,55 +19,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDeptEntity
@Override
public List<SysDeptVO> queryPositionList(SysDeptDTO sysDeptDTO) {
// 1. 查询所有岗位数据
List<SysDeptVO> sysPositionVOList = baseMapper.queryDeptList(sysDeptDTO);
// 2. 构建树形结构
return buildPositionTree(sysPositionVOList);
return baseMapper.queryDeptList(sysDeptDTO);
}
/**
* 从所有岗位中构建树形结构
*/
private List<SysDeptVO> buildPositionTree(List<SysDeptVO> sysDeptVOS) {
// 1. 创建ID到岗位的映射
Map<Integer, SysDeptVO> positionMap = new HashMap<>();
for (SysDeptVO position : sysDeptVOS) {
positionMap.put(position.getId(), position);
}
// 2. 构建树形结构
List<SysDeptVO> result = new ArrayList<>();
for (SysDeptVO position : sysDeptVOS) {
if (position.getParentId()==null) {//修改
// 顶级节点
result.add(position);
} else {
// 子节点,添加到父节点的children中
SysDeptVO parent = positionMap.get(position.getParentId());
if (parent != null) {
if (parent.getChildren() == null) {
parent.setChildren(new ArrayList<>());
}
parent.getChildren().add(position);
}
}
}
// 3. 对每个父节点的 children 列表进行排序
for (SysDeptVO position : result) {
sortChildren(position);
}
return result;
}
private void sortChildren(SysDeptVO position) {
if (position.getChildren() != null && !position.getChildren().isEmpty()) {
// 使用 Comparator.comparingInt 进行排序,并使用 reversed() 使 sortOrder 越大越靠前
position.getChildren().sort(Comparator.comparingInt(SysDeptVO::getSortOrder).reversed());
for (SysDeptVO child : position.getChildren()) {
sortChildren(child); // 递归排序子节点
}
}
}
}
......@@ -55,32 +55,31 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
@Override
public LoginEntity login(LoginEntity login){
String userName = login.getUserName();
String name = login.getName();
String password = login.getPassword(); // ⚠️ 这是用户登录时输入的明文密码
// 1. 查询用户
QueryWrapper<SysUserEntity> query = new QueryWrapper<>();
query.eq("user_name", userName);
query.eq("name", name);
SysUserEntity user = getOne(query);
if (user == null) {
throw new RuntimeException("用户不存在");
}
// 2. 校验密码(BCrypt 校验用户输入的密码 和 数据库中存储的 BCrypt 密文是否匹配)
boolean isPasswordValid = BCrypt.checkpw(password, user.getPassword());
if (!isPasswordValid) {
//验证密码
if (!password.equals(user.getPassword())) {
throw new RuntimeException("密码错误");
}
// 4. 生成 JWT Token
String token = jwtUtil.generateToken(String.valueOf(user.getId()), user.getUserName());
String token = jwtUtil.generateToken(String.valueOf(user.getId()), user.getName());
// 5. 构造返回对象,并告知是否初始密码
LoginEntity response = new LoginEntity();
response.setToken(token);
response.setUserId(user.getId());
response.setUserName(user.getUserName());
response.setName(user.getName());
return response;
}
......
......@@ -21,10 +21,10 @@ public class JwtUtil {
private Long expiration;
// 生成 JWT Token
public String generateToken(String userId, String userName) {
public String generateToken(String userId, String name) {
Map<String, Object> claims = new HashMap<>();
claims.put("userId", userId);
claims.put("userName", userName);
claims.put("name", name);
Date now = new Date();
Date expiryDate = new Date(now.getTime() + expiration * 1000L);
......@@ -80,13 +80,13 @@ public class JwtUtil {
.getBody();
// 优先从subject获取,如果没有则从userName字段获取
String userName = claims.get("userName", String.class);
String name = claims.get("name", String.class);
if (userName == null || userName.isEmpty()) {
if (name == null || name.isEmpty()) {
throw new RuntimeException("Token 中缺少用户信息");
}
return userName;
return name;
} catch (io.jsonwebtoken.ExpiredJwtException e) {
throw new RuntimeException("Token 已过期");
......@@ -140,7 +140,7 @@ public class JwtUtil {
public boolean validateTokenAndHasUserName(String token) {
try {
Claims claims = parseToken(token);
String userName = claims.get("userName", String.class);
String userName = claims.get("name", String.class);
return userName != null && !userName.trim().isEmpty();
} catch (Exception e) {
return false;
......
......@@ -4,19 +4,19 @@
<mapper namespace="com.platform.projectBusiness.mapper.BsProjectPeopleScoreDetailMapper">
<select id="queryProjectPeopleScoreDetailList" resultType="com.platform.projectBusiness.model.vo.BsProjectPeopleScoreDetailVO">
select
id,
project_id,
project_people,
assessment_description,
assessment_standard,
parent_id,
score,
percentage,
level,
status,
assessment_id
bppsd.id as id,
bppsd.project_id as projectId,
bppsd.project_people as projectPeople,
bppsd.assessment_description as assessmentDescription,
bppsd.assessment_standard as assessmentStandard,
bppsd.parent_id as parentId,
bppsd.score as score,
bppsd.percentage as percentage,
bppsd.level as level,
bppsd.status as status,
bppsd.assessment_id as assessmentId
from
bs_project_people_score_detail
bs_project_people_score_detail bppsd
<where>
<if test="projectId != null and projectId != ''">
project_id = #{projectId}
......
......@@ -4,14 +4,19 @@
<mapper namespace="com.platform.projectBusiness.mapper.BsProjectPeopleScoreMapper">
<select id="queryProjectPeopleScoreList" resultType="com.platform.projectBusiness.model.vo.BsProjectPeopleScoreVO">
select
id,
project_id,
project_role,
project_people,
score,
status
bpps.id,
bpps.project_id,
bpps.project_role,
bpps.project_people,
bpps.score,
bpps.status,
su.name as nickName
from
bs_project_people_score
bs_project_people_score bpps
left join
user su
on
bpps.project_people = su.id
<where>
<if test="projectId != null and projectId != ''">
project_id = #{projectId}
......
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