WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-fy.cn/WxxyDeveloper/JSL_OrganizeInternalOA

Browse Source
This commit is contained in:
xiangZr-hhh 2024-01-23 19:40:31 +08:00
commit e9950a84d0
6 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/jsl/oa/controllers/RoleController.java
View File

@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletRequest;
* @version v1.1.0
* @see RoleService
* @since v1.1.0
* @author xiao_lfeng | 176yunxuan | xiangZr-hhh
*/
@Slf4j
@RestController
@ -82,7 +83,7 @@ public class RoleController {
if (id == null) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
}
return roleService.roleDelete(request, Long.valueOf(id));
return roleService.roleDelete(request, id);
}
/**

18
src/main/java/com/jsl/oa/dao/UserDAO.java
View File

@ -19,6 +19,16 @@ import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
/**
* <h1>用户 DAO</h1>
* <hr/>
* 用于用户的增删改查,以及用户权限的获取,用户信息的获取,用户信息的修改,用户信息的删除,用户信息的锁定,用户信息的解锁,用户信息的添加,用户信息的
* 编辑等
*
* @version v1.1.0
* @since v1.1.0
* @author xiao_lfeng | 176yunxuan | xiangZr-hhh
*/
@Slf4j
@Component
@RequiredArgsConstructor
@ -125,9 +135,7 @@ public class UserDAO {
log.info("\t\t> 从 MySQL 获取数据");
List<UserDO> userCurrentDO = userMapper.getAllUser(userAllCurrentVO);
List<UserCurrentBackVO> userCurrentDOList = new ArrayList<>();
userCurrentDO.forEach(it -> {
userCurrentDOList.add(Processing.returnUserInfo(it, roleDAO, permissionDAO));
});
userCurrentDO.forEach(it -> userCurrentDOList.add(Processing.returnUserInfo(it, roleDAO, permissionDAO)));
return userCurrentDOList;
}
@ -137,9 +145,7 @@ public class UserDAO {
log.info("\t\t> 从 MySQL 获取数据");
List<UserDO> userCurrentDO = userMapper.getAllUserBySearch(userAllCurrentVO);
List<UserCurrentBackVO> userCurrentDOList = new ArrayList<>();
userCurrentDO.forEach(it -> {
userCurrentDOList.add(Processing.returnUserInfo(it, roleDAO, permissionDAO));
});
userCurrentDO.forEach(it -> userCurrentDOList.add(Processing.returnUserInfo(it, roleDAO, permissionDAO)));
return userCurrentDOList;
}

17
src/main/java/com/jsl/oa/model/doData/PageBeanDO.java
View File

@ -6,10 +6,21 @@ import lombok.NoArgsConstructor;
import java.util.List;
/**
* <h1>分页数据对象</h1>
* <hr/>
* 用于分页数据的封装
*
* @since v1.1.0
* @version v1.1.0
* @author 176yunxuan
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class PageBeanDO {
private Long total;//总记录数
private List rows;//数据列表
public class PageBeanDO<R> {
//总记录数
private Long total;
//数据列表
private List<R> rows;
}

2
src/main/java/com/jsl/oa/services/impl/InfoServiceImpl.java
View File

@ -40,7 +40,7 @@ public class InfoServiceImpl implements InfoService {
private final UserDAO userDAO;
@Override
@CheckUserHasPermission("")
@CheckUserHasPermission("info.image.add")
public BaseResponse addHeaderImage(HttpServletRequest request, CarouselVO carouselVO) {
log.info("\t> 执行 Service 层 InfoService.addHeaderImage 方法");
// 用户权限校验

33
src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java
View File

@ -10,10 +10,9 @@ import com.jsl.oa.utils.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.List;
@ -31,55 +30,55 @@ public class MessageServiceImpl implements MessageService {
MessageDO messageDO = messageMapper.getMessageById(mid);
//检测用户id与消息的uid是否相同
String token = request.getHeader("Authorization").replace("Bearer ", "");
if (!(messageDO.getUid() == JwtUtil.getUserId(token))) {
if (!(messageDO.getUid().equals(JwtUtil.getUserId(token)))) {
return ResultUtil.error(ErrorCode.MESSAGE_ONLY_DELETE_BY_THEMSELVES);
}
//执行删除
if(!messageMapper.deleteMessage(mid)){
if (!messageMapper.deleteMessage(mid)) {
return ResultUtil.error(ErrorCode.DATABASE_UPDATE_ERROR);
}
return ResultUtil.success();
}
@Override
public BaseResponse messageGet(LocalDate begin,LocalDate end,Long page,Long pageSize,Long uid) {
public BaseResponse messageGet(LocalDate begin, LocalDate end, Long page, Long pageSize, Long uid) {
//1.记录总数据数
Long count = messageMapper.count(uid);
//2.获取分页数据列表
//默认获取时间为最近30天
if(begin == null){
if (begin == null) {
begin = LocalDate.now();
end = begin.minus(30, ChronoUnit.DAYS);
end = begin.minusDays(30);
}
Long start = (page-1) * pageSize;
List<MessageDO> empList = messageMapper.page(begin,end,uid,start,pageSize);
Long start = (page - 1) * pageSize;
List<MessageDO> empList = messageMapper.page(begin, end, uid, start, pageSize);
//3.封装PageBean对象
PageBeanDO pageBean = new PageBeanDO(count,empList);
PageBeanDO<MessageDO> pageBean = new PageBeanDO<>(count, empList);
return ResultUtil.success(pageBean);
}
@Override
public BaseResponse messageGetAll(HttpServletRequest request,LocalDate begin, LocalDate end, Long page, Long pageSize, Long loginId, Long uid) {
public BaseResponse messageGetAll(HttpServletRequest request, LocalDate begin, LocalDate end, Long page, Long pageSize, Long loginId, Long uid) {
log.info("请求接口服务层");
if(!Processing.checkUserIsAdmin(request,roleMapper)){
if (!Processing.checkUserIsAdmin(request, roleMapper)) {
return ResultUtil.error(ErrorCode.NOT_ADMIN);
}else {
} else {
//1.记录总数据数
Long count = messageMapper.count(uid);
//2.获取分页数据列表
//默认获取时间为最近30天
if(begin == null){
if (begin == null) {
begin = LocalDate.now();
end = begin.minus(30, ChronoUnit.DAYS);
end = begin.minusDays(30);
}
Long start = (page - 1) * pageSize;
List<MessageDO> messageDOList = messageMapper.page(begin,end,uid, start, pageSize);
List<MessageDO> messageDOList = messageMapper.page(begin, end, uid, start, pageSize);
//3.封装PageBean对象
PageBeanDO pageBean = new PageBeanDO(count, messageDOList);
PageBeanDO<MessageDO> pageBean = new PageBeanDO<>(count, messageDOList);
return ResultUtil.success(pageBean);
}
}

2
src/main/java/com/jsl/oa/utils/Processing.java
View File

@ -198,7 +198,7 @@ public class Processing {
Field[] sourceFields = sourceClass.getDeclaredFields();
for (Field sourceField : sourceFields) {
String fieldName = sourceField.getName();
Field targetField = null;
Field targetField;
try {
targetField = targetClass.getDeclaredField(fieldName);
} catch (NoSuchFieldException e) {