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

patch: 优化日志处理模式，删除多余的日志信息
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 23s
Details

Browse Source
This commit is contained in:
筱锋xiao_lfeng 2024-04-16 17:29:21 +08:00
parent 7b1cead10e
commit 76a1cf758c
Signed by: XiaoLFeng
GPG Key ID: F693AA12AABBFA87
31 changed files with 49 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/jsl/oa/aspect/BusinessAop.java
View File

@ -3,6 +3,8 @@ package com.jsl.oa.aspect;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.reflect.MethodSignature;
@ -44,9 +46,16 @@ public class BusinessAop {
HttpServletRequest request = servletRequestAttributes.getRequest();
// 获取方法签名
MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
Class<?> declaringType = methodSignature.getDeclaringType();
String methodName = methodSignature.getName();
log.info("[CONTROL] 执行 {} 接口 | 地址: [{}]{}", methodName, request.getMethod(), request.getServletPath());
log.info(
"[CONTROL] 执行 {}:{} 接口 | 地址: [{}]{}",
declaringType.getName(),
methodName,
request.getMethod(),
request.getServletPath()
);
} else {
throw new RuntimeException("无法获取信息");
}
@ -61,25 +70,31 @@ public class BusinessAop {
public void beforeService(@NotNull JoinPoint joinPoint) {
// 获取方法签名
MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
Class<?> declaringType = methodSignature.getDeclaringType();
String methodName = methodSignature.getName();
log.info("[SERVICE] 执行 {} 业务", methodName);
log.info("[SERVICE] 执行 {}:{} 业务", declaringType.getName(), methodName);
}
/**
* 在DAO的所有方法执行前执行
*
* @param joinPoint 切入点提供对方法执行的信息
* @param pjp 切入点提供对方法执行的信息
*/
@Before("execution(* com.jsl.oa.dao.*.*(..))")
public void beforeDao(@NotNull JoinPoint joinPoint) {
@Around("execution(* com.jsl.oa.dao.*.*(..))")
public Object beforeDao(@NotNull ProceedingJoinPoint pjp) throws Throwable {
// 获取方法签名
MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
MethodSignature methodSignature = (MethodSignature) pjp.getSignature();
Class<?> declaringType = methodSignature.getDeclaringType();
String methodName = methodSignature.getName();
Object[] args = joinPoint.getArgs();
log.info("[DAO] 操作 {} 记录", methodName);
Object[] args = pjp.getArgs();
log.info("==>[DAO] 操作 {}:{} 记录", declaringType.getName(), methodName);
if (args.length != 0) {
log.debug("\t> 传入信息：{}", Arrays.toString(args));
}
Object result = pjp.proceed();
log.info("<==[DAO] 返回数据类型 {}", declaringType.descriptorString());
log.debug("\t> 传出信息：{}", result.toString());
return result;
}
}

8
src/main/java/com/jsl/oa/controllers/AuthController.java
View File

@ -55,7 +55,6 @@ public class AuthController {
@RequestBody @Validated UserRegisterVO userRegisterVO,
@NotNull BindingResult bindingResult
) {
log.info("请求接口[POST]: /auth/register");
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -79,8 +78,6 @@ public class AuthController {
@RequestBody @Validated UserLoginVO userLoginVO,
@NotNull BindingResult bindingResult
) {
log.info("请求接口[POST]: /auth/login");
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -100,7 +97,6 @@ public class AuthController {
*/
@GetMapping("/auth/email/code")
public BaseResponse authSendEmailCode(@RequestParam String email) {
log.info("请求接口[GET]: /auth/email/code");
if (email != null) {
if (Pattern.matches("^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", email)) {
return authService.authLoginSendEmailCode(email);
@ -125,7 +121,6 @@ public class AuthController {
*/
@GetMapping("/auth/login/email")
public BaseResponse authLoginByEmail(@RequestParam String email, @RequestParam String code) {
log.info("请求接口[GET]: /auth/login/email");
if (email != null && code != null && !email.isEmpty() && !code.isEmpty()) {
if (Pattern.matches("^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", email)) {
try {
@ -152,7 +147,6 @@ public class AuthController {
*/
@GetMapping("/auth/logout")
public BaseResponse authLogout(HttpServletRequest request) {
log.info("请求接口[GET]: /auth/logout");
return authService.authLogout(request);
}
@ -173,7 +167,6 @@ public class AuthController {
@NotNull BindingResult bindingResult,
HttpServletRequest request
) {
log.info("请求接口[PUT]: /auth/password");
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -191,7 +184,6 @@ public class AuthController {
@RequestBody @Validated UserForgetPasswordVO userForgetPasswordVO,
@NotNull BindingResult bindingResult
) {
log.info("请求接口[PUT]: /auth/password/forget");
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));

1
src/main/java/com/jsl/oa/controllers/IndexController.java
View File

@ -35,7 +35,6 @@ public class IndexController {
*/
@RequestMapping("/")
public BaseResponse index() {
log.info("请求接口[GET]: /");
HashMap<String, String> newMap = new HashMap<>();
newMap.put("timestamp", "构建时间：" + timestamp);
return ResultUtil.success("欢迎使用JSL-OA系统，服务器处于正常状态", newMap);

6
src/main/java/com/jsl/oa/controllers/InfoController.java
View File

@ -42,7 +42,6 @@ public class InfoController {
*/
@GetMapping("/info/header-image/get")
public BaseResponse infoGetHeaderImage(@RequestParam(required = false) Integer id) {
log.info("请求接口[GET]: /info/header-image/get");
return infoService.getHeaderImage(id);
}
@ -60,7 +59,6 @@ public class InfoController {
HttpServletRequest request,
@NotNull BindingResult bindingResult
) {
log.info("请求接口[PUT]: /info/header-image/edit");
// 参数校验
if (bindingResult.hasErrors()) {
log.warn("参数校验失败: {}", Processing.getValidatedErrorList(bindingResult));
@ -82,7 +80,6 @@ public class InfoController {
*/
@DeleteMapping("/info/header-image/del")
public BaseResponse infoDelHeaderImage(@RequestParam Integer id, HttpServletRequest request) {
log.info("请求接口[DELETE]: /info/header-image/del");
return infoService.delHeaderImage(request, id);
}
@ -100,7 +97,6 @@ public class InfoController {
HttpServletRequest request,
@NotNull BindingResult bindingResult
) {
log.info("请求接口[POST]: /info/header-image/add");
// 参数校验
if (bindingResult.hasErrors()) {
log.warn("参数校验失败: {}", Processing.getValidatedErrorList(bindingResult));
@ -118,7 +114,6 @@ public class InfoController {
*/
@PutMapping("/info/header-image/edit-setting")
public BaseResponse infoEditSettingHeaderImage(@RequestParam Boolean showType, HttpServletRequest request) {
log.info("请求接口[PUT]: /info/header-image/edit-setting");
return infoService.editSettingHeaderImage(request, showType);
}
@ -136,7 +131,6 @@ public class InfoController {
@RequestParam String orderBy,
HttpServletRequest request
) {
log.info("请求接口[GET]: /info/header-user/get");
return infoService.getHeaderUser(request, order, orderBy);
}
}

2
src/main/java/com/jsl/oa/controllers/MessageController.java
View File

@ -65,7 +65,6 @@ public class MessageController {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime begin,
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime end,
HttpServletRequest request) {
log.info("请求接口[GET]:/message/get");
String token = request.getHeader("Authorization").replace("Bearer ", "");
Long uid = JwtUtil.getUserId(token);
if (uid == null) {
@ -79,7 +78,6 @@ public class MessageController {
public BaseResponse messageGetById(
@RequestParam Long id,
HttpServletRequest request) {
log.info("请求接口[GET]:/message/get/id");
String token = request.getHeader("Authorization").replace("Bearer ", "");
Long uid = JwtUtil.getUserId(token);
if (uid == null) {

5
src/main/java/com/jsl/oa/controllers/ModuleController.java
View File

@ -33,8 +33,6 @@ public class ModuleController {
*/
@GetMapping("/module/get")
public BaseResponse moduleGetByProjectId(@RequestParam Integer projectId, HttpServletRequest request) {
log.info("[Controller] 执行 moduleGetByProjectId 接口");
return moduleService.getByProjectId(projectId, request);
}
@ -47,8 +45,6 @@ public class ModuleController {
*/
@GetMapping("/module/get/min")
public BaseResponse moduleGetBySysId(@RequestParam Integer sysId, HttpServletRequest request) {
log.info("[Controller] 执行 moduleGetBySysId 接口");
return moduleService.getBySysId(sysId, request);
}
@ -61,7 +57,6 @@ public class ModuleController {
*/
@DeleteMapping("/module/delete/{id}")
public BaseResponse moduleDeleteById(@PathVariable("id") Long id, HttpServletRequest request) {
log.info("[Controller] 执行 moduleDeleteById 接口");
return moduleService.deleteById(request, id);
}

1
src/main/java/com/jsl/oa/controllers/NewsController.java
View File

@ -52,7 +52,6 @@ public class NewsController {
BindingResult bindingResult,
HttpServletRequest request
) {
log.info("请求接口[POST]: /news/add");
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));

5
src/main/java/com/jsl/oa/controllers/PermissionController.java
View File

@ -40,7 +40,6 @@ public class PermissionController {
*/
@PostMapping("/permission/add")
public BaseResponse permissionAdd(HttpServletRequest request, @RequestParam Long rid, @RequestParam Long pid) {
log.info("请求接口[POST]: /permission/add");
// 判断是否有参数错误
if (rid == null || pid == null) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
@ -58,7 +57,6 @@ public class PermissionController {
*/
@GetMapping("/permission/current")
public BaseResponse permissionUser(HttpServletRequest request, @RequestParam Long uid) {
log.info("请求接口[GET]: /permission/current");
// 判断是否有参数错误
if (uid == null) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
@ -75,7 +73,6 @@ public class PermissionController {
*/
@GetMapping("/permission/get")
public BaseResponse permissionGet(HttpServletRequest request) {
log.info("请求接口[GET]: /permission/get");
return permissionService.permissionGet(request);
}
@ -93,7 +90,6 @@ public class PermissionController {
BindingResult bindingResult,
HttpServletRequest request
) {
log.info("请求接口[PUT]: /permission/edit");
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -110,7 +106,6 @@ public class PermissionController {
*/
@DeleteMapping("/permission/delete")
public BaseResponse permissionDelete(@RequestParam Long pid, HttpServletRequest request) {
log.info("请求接口[Delete]: /permission/delete");
// 判断是否有参数错误
if (pid == null) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);

51
src/main/java/com/jsl/oa/controllers/ProjectController.java
View File

@ -46,7 +46,6 @@ public class ProjectController {
*/
@GetMapping("/project/header/get")
public BaseResponse projectGetHeader(@RequestParam(required = false) final Integer id) {
log.info("请求接口[GET]: /project/header/get");
return projectService.getHeader(id);
}
@ -79,8 +78,8 @@ public class ProjectController {
@RequestParam(required = false) List<String> tags,
@RequestParam(required = false) List<String> isFinish,
@RequestParam(required = false, defaultValue = "1") Integer page,
@RequestParam(required = false, defaultValue = "10") Integer pageSize) {
log.info("请求接口[GET]: /project/get/custom");
@RequestParam(required = false, defaultValue = "10") Integer pageSize
) {
return projectService.tGet(tags, isFinish, page, pageSize);
}
@ -98,7 +97,6 @@ public class ProjectController {
@PathVariable String projectId,
HttpServletRequest request
) {
log.info("请求接口[GET]: /project/get");
// 对 projectId 进行判断
if (!projectId.matches("^[0-9]+$")) {
return ResultUtil.error("参数 projectId 不是一个数字", ErrorCode.PARAMETER_ERROR);
@ -118,8 +116,8 @@ public class ProjectController {
@RequestParam(required = false) Integer is,
@RequestParam(required = false, defaultValue = "1") Integer page,
@RequestParam(required = false, defaultValue = "10") Integer pageSize,
HttpServletRequest request) {
log.info("请求接口[GET]: /project/work/get");
HttpServletRequest request
) {
return projectService.workGet(request, tags, isFinish, is, page, pageSize);
}
@ -132,7 +130,6 @@ public class ProjectController {
*/
@GetMapping("/project/header")
public BaseResponse projectGetByName(@RequestParam String name) {
log.info("请求接口[GET]: /project/header");
return projectService.getByName(name);
}
@ -146,10 +143,11 @@ public class ProjectController {
* @return {@link BaseResponse}
*/
@PostMapping("/project/header/add")
public BaseResponse projectAddHeader(@RequestBody @Validated ProjectShowVO projectShowVO,
HttpServletRequest request,
@NotNull BindingResult bindingResult) {
log.info("请求接口[POST]: /project/header/add");
public BaseResponse projectAddHeader(
@RequestBody @Validated ProjectShowVO projectShowVO,
HttpServletRequest request,
@NotNull BindingResult bindingResult
) {
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -168,11 +166,12 @@ public class ProjectController {
* @return {@link BaseResponse}
*/
@PutMapping("/project/header/edit/{projectId}")
public BaseResponse projectEditById(@RequestParam Long projectId,
@RequestBody @Validated ProjectEditVO projectEdit,
@NotNull BindingResult bindingResult,
HttpServletRequest request) {
log.info("请求接口[PUT]: /project/header/edit/{projectId}");
public BaseResponse projectEditById(
@PathVariable Long projectId,
@RequestBody @Validated ProjectEditVO projectEdit,
@NotNull BindingResult bindingResult,
HttpServletRequest request
) {
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -188,10 +187,11 @@ public class ProjectController {
* @return {@link BaseResponse}
*/
@PostMapping("/project/work/add")
public BaseResponse projectWorkAdd(HttpServletRequest request,
@RequestBody @Validated ProjectWorkVO projectWorkVO,
@NotNull BindingResult bindingResult) {
log.info("请求接口[POST]: /project/work/add");
public BaseResponse projectWorkAdd(
HttpServletRequest request,
@RequestBody @Validated ProjectWorkVO projectWorkVO,
@NotNull BindingResult bindingResult
) {
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -210,10 +210,11 @@ public class ProjectController {
*/
@PostMapping("/project/add")
public BaseResponse projectAdd(HttpServletRequest request,
@RequestBody @Validated ProjectInfoVO projectInfoVO,
@NotNull BindingResult bindingResult) {
log.info("请求接口[POST]: /project/add");
public BaseResponse projectAdd(
@RequestBody @Validated ProjectInfoVO projectInfoVO,
@NotNull BindingResult bindingResult,
HttpServletRequest request
) {
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -239,7 +240,6 @@ public class ProjectController {
*/
@DeleteMapping("/project/delete")
public BaseResponse projectDelete(HttpServletRequest request, @RequestParam List<Long> id) {
log.info("请求接口[Delete]: /project/delete");
if (id == null) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
}
@ -248,7 +248,6 @@ public class ProjectController {
@GetMapping("/project/file")
public BaseResponse getProjectFile(HttpServletRequest request, @RequestParam Long projectId) {
log.info("请求接口[Get]: /project/file");
//判断是否有参数错误
if (projectId == null) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR);

2
src/main/java/com/jsl/oa/controllers/ReviewController.java
View File

@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletRequest;
@RequiredArgsConstructor
public class ReviewController {
// 审核服务
private final ReviewService reviewService;
/**
@ -32,7 +31,6 @@ public class ReviewController {
**/
@GetMapping("/review/getMyReview")
public BaseResponse getUserReview(@RequestParam Long projectId, HttpServletRequest request) {
log.info("请求接口[GET]: /review/getMyReview");
return reviewService.getUserReview(projectId, request);
}

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

@ -43,7 +43,6 @@ public class RoleController {
*/
@GetMapping("/role/get")
public BaseResponse roleGet(HttpServletRequest request, @RequestParam(required = false) String id) {
log.info("请求接口[GET]: /role/get");
return roleService.roleGet(request, id);
}
@ -63,7 +62,6 @@ public class RoleController {
@NotNull BindingResult bindingResult,
HttpServletRequest request
) {
log.info("请求接口[PUT]: /role/edit");
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -82,7 +80,6 @@ public class RoleController {
*/
@DeleteMapping("/role/delete")
public BaseResponse roleDelete(HttpServletRequest request, @RequestParam Long id) {
log.info("请求接口[DELETE]: /role/delete");
// 判断是否有参数错误
if (id == null) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
@ -97,7 +94,6 @@ public class RoleController {
*/
@PostMapping("role/user/add")
public BaseResponse roleAddUser(HttpServletRequest request, @RequestParam Long uid, @RequestParam Long rid) {
log.info("请求接口[POST]: /role/user/add");
// 判断是否有参数错误
if (uid == null || rid == null) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
@ -112,7 +108,6 @@ public class RoleController {
*/
@DeleteMapping("role/user/remove")
public BaseResponse roleRemoveUser(HttpServletRequest request, @RequestParam Long uid) {
log.info("请求接口[POST]: /role/user/remove");
// 判断是否有参数错误
if (uid == null) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
@ -131,7 +126,6 @@ public class RoleController {
@NotNull BindingResult bindingResult,
HttpServletRequest request
) throws ClassCopyException {
log.info("请求接口[POST]: /role/add");
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -146,7 +140,6 @@ public class RoleController {
*/
@PutMapping("role/user/change")
public BaseResponse roleChangeUser(HttpServletRequest request, @RequestParam Long uid, @RequestParam Long rid) {
log.info("请求接口[POST]: /role/user/change");
// 判断是否有参数错误
if (uid == null || rid == null) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);

1
src/main/java/com/jsl/oa/controllers/TagController.java
View File

@ -33,7 +33,6 @@ public class TagController {
@RequestParam(required = false) String limit,
@RequestParam(required = false) String order
) {
log.info("[Controller] 请求 getProjectList 接口");
// 处理默认数据
if (page == null || !Pattern.matches("^[0-9]+$", page) || Integer.parseInt(page) < 1) {
page = "1";

8
src/main/java/com/jsl/oa/controllers/UserController.java
View File

@ -44,7 +44,6 @@ public class UserController {
*/
@DeleteMapping("/user/delete")
public BaseResponse userDelete(HttpServletRequest request, @RequestParam String id) {
log.info("请求接口[PUT]: /user/delete");
// 判断是否有参数错误
if (id == null) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
@ -61,7 +60,6 @@ public class UserController {
*/
@PutMapping("/user/lock")
public BaseResponse userLock(HttpServletRequest request, @RequestParam Long id, @RequestParam Long isLock) {
log.info("请求接口[PUT]: /user/lock");
// 判断是否有参数错误
if (id == null) {
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
@ -81,7 +79,6 @@ public class UserController {
@RequestBody @Validated UserEditProfileVO userEditProfileVO,
BindingResult bindingResult
) {
log.info("请求接口[PUT]: /user/profile/edit");
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -110,7 +107,6 @@ public class UserController {
@RequestParam @Nullable String phone,
@NotNull HttpServletRequest request
) {
log.info("请求接口[GET]: /user/current");
// 检查数据是否有问题
if (id != null && !id.isEmpty()) {
if (!Pattern.matches("^[0-9]+$", id)) {
@ -153,7 +149,6 @@ public class UserController {
@NotNull BindingResult bindingResult,
HttpServletRequest request
) {
log.info("请求接口[POST]: /user/current/all");
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -174,7 +169,6 @@ public class UserController {
BindingResult bindingResult,
HttpServletRequest request
) {
log.info("请求接口[POST]: /user/add");
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -194,7 +188,6 @@ public class UserController {
BindingResult bindingResult,
HttpServletRequest request
) {
log.info("请求接口[PUT]: /user/edit");
// 判断是否有参数错误
if (bindingResult.hasErrors()) {
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
@ -205,7 +198,6 @@ public class UserController {
@GetMapping("/user/profile/get")
public BaseResponse userProfileGet(HttpServletRequest request) {
log.info("请求接口[GET]: /user/profile/get");
return userService.userProfileGet(request);
}

4
src/main/java/com/jsl/oa/dao/InfoDAO.java
View File

@ -35,8 +35,6 @@ public class InfoDAO {
* @return {@link CarouselDO}
*/
public CarouselDO getCarousel() {
log.info("\t> 执行 DAO 层 InfoDAO.getCarousel 方法");
log.info("\t\t> 从 MySQL 获取数据");
String getCarouselSql = infoMapper.getCarousel();
CarouselDO getCarousel = null;
if (getCarouselSql != null && !"{}".equals(getCarouselSql)) {
@ -87,14 +85,12 @@ public class InfoDAO {
* @return {@link Boolean}
*/
public boolean setCarousel(CarouselDO carouselDO) {
log.info("\t> 执行 DAO 层 InfoDAO.setCarousel 方法");
sortCarousel(carouselDO);
// 添加id
for (int i = 0; i < carouselDO.getData().size(); i++) {
carouselDO.getData().get(i).setId(i + 1);
}
String setCarouselSql = gson.toJson(carouselDO);
log.info("\t\t> 从 MySQL 获取数据");
return infoMapper.setCarousel(setCarouselSql);
}
}

2
src/main/java/com/jsl/oa/dao/NewsDAO.java
View File

@ -15,8 +15,6 @@ public class NewsDAO {
private final NewsMapper newsMapper;
public void addNews(NewsDO newsVO, Long uid) {
log.info("\t> 执行 DAO 层 NewsDAO.addNews 方法");
log.info("\t\t> 从 MySQL 获取数据");
// 添加新闻数据
newsMapper.addNews(newsVO);
// 添加作者

9
src/main/java/com/jsl/oa/dao/PermissionDAO.java
View File

@ -40,29 +40,24 @@ public class PermissionDAO {
* @return {@link List<String>}
*/
public List<String> getPermission(@NotNull Long uid) {
log.info("\t> 执行 DAO 层 PermissionDAO.getPermission 方法");
List<String> getPermissionForString;
String permissionRedisString = roleRedisUtil.getData(BusinessConstants.NONE, uid.toString());
if (permissionRedisString == null) {
log.info("\t\t> 从 MySQL 获取数据");
List<PermissionDO> permissionList = permissionMapper.permissionUserPid(uid);
getPermissionForString = new ArrayList<>();
forPermissionToBuildString(permissionList, getPermissionForString);
// 存入 Redis
roleRedisUtil.setData(BusinessConstants.NONE, uid.toString(), gson.toJson(getPermissionForString), 1440);
} else {
log.info("\t\t> 从 Redis 获取数据");
getPermissionForString = gson.fromJson(permissionRedisString, new TypeToken<List<String>>() { }.getType());
}
return getPermissionForString;
}
public List<String> getAllPermissionBuildString() {
log.info("\t> 执行 DAO 层 PermissionDAO.getPermission 方法");
List<String> getPermissionForString;
String getRedisData = roleRedisUtil.getData(BusinessConstants.ALL_PERMISSION, "string");
if (getRedisData == null) {
log.info("\t\t> 从 MySQL 获取数据");
List<PermissionDO> permissionList = permissionMapper.getAllPermission();
permissionList.removeIf(it -> it.getPid() != null);
getPermissionForString = new ArrayList<>();
@ -74,17 +69,14 @@ public class PermissionDAO {
gson.toJson(getPermissionForString),
1440);
} else {
log.info("\t\t> 从 Redis 获取数据");
getPermissionForString = gson.fromJson(getRedisData, new TypeToken<List<String>>() { }.getType());
}
return getPermissionForString;
}
public List<PermissionDO> getRootPermission() {
log.info("\t> 执行 DAO 层 PermissionDAO.getRootPermission 方法");
String getRedisData = roleRedisUtil.getData(BusinessConstants.ALL_PERMISSION, "all");
if (getRedisData == null) {
log.info("\t\t> 从 MySQL 获取数据");
List<PermissionDO> permissionList = permissionMapper.getAllPermission();
if (!permissionList.isEmpty()) {
List<PermissionDO> getPermissionList = new ArrayList<>();
@ -99,7 +91,6 @@ public class PermissionDAO {
return null;
}
} else {
log.info("\t\t> 从 Redis 获取数据");
return gson.fromJson(getRedisData, new TypeToken<List<PermissionDO>>() {
}.getType());
}

38
src/main/java/com/jsl/oa/dao/ProjectDAO.java
View File

@ -28,38 +28,27 @@ public class ProjectDAO {
private final Gson gson;
public void projectAdd(ProjectInfoVO projectAdd) {
log.info("\t> 执行 DAO 层 ProjectDAO.projectAdd 方法");
log.info("\t\t> 从 MySQL 获取数据");
projectMapper.projectAdd(projectAdd);
}
public void projectWorkAdd(ProjectWorkVO projectWorkVO) {
log.info("\t> 执行 DAO 层 ProjectDAO.projectWorkAdd 方法");
log.info("\t\t> 从 MySQL 获取数据");
projectMapper.projectWorkAdd(projectWorkVO);
}
public ProjectDO projectEdit(@NotNull ProjectEditVO projectEdit, Long projectId) {
log.info("\t> 执行 DAO 层 ProjectDAO.projectEdit 方法");
log.info("\t\t> 从 MySQL 更新数据");
ProjectDO projectDO = new ProjectDO();
Processing.copyProperties(projectEdit, projectDO);
projectDO.setId(projectId);
projectMapper.projectEdit(projectDO);
log.info("\t\t> 从 MySQL 获取数据");
return projectMapper.getProjectById(projectId);
}
public boolean isExistProject(Long id) {
log.info("\t> 执行 DAO 层 ProjectDAO.isExistProject 方法");
log.info("\t\t> 从 MySQL 获取数据");
return projectMapper.getProjectById(id) != null;
}
public ProjectShowDO getHeader() {
log.info("\t> 执行 DAO 层 ProjectDAO.getHeader 方法");
log.info("\t\t> 从 MySQL 获取数据");
String getProjectShowSql = projectMapper.getHeader();
ProjectShowDO getProjectShow = null;
if (getProjectShowSql != null && !"{}".equals(getProjectShowSql)) {
@ -71,7 +60,6 @@ public class ProjectDAO {
getProjectShow.setOrder("desc");
getProjectShow.setData(new ArrayList<>());
try {
log.info("\t\t> 从 MySQL 插入数据");
projectMapper.insertProjectShow();
} catch (DuplicateKeyException ignored) {
}
@ -82,7 +70,6 @@ public class ProjectDAO {
}
private void sortProject(@NotNull ProjectShowDO projectShowDO) {
log.info("\t> 执行 DAO 层 ProjectDAO.sortProject 方法");
for (int i = 0; i < projectShowDO.getData().size(); i++) {
for (int j = 0; j < projectShowDO.getData().size(); j++) {
if ("desc".equals(projectShowDO.getOrder())) {
@ -101,30 +88,22 @@ public class ProjectDAO {
}
public boolean setProjectShow(ProjectShowDO projectShowDO) {
log.info("\t> 执行 DAO 层 ProjectDAO.setProjectShow 方法");
sortProject(projectShowDO);
String setProjectShow = gson.toJson(projectShowDO);
log.info("\t\t> 从 MySQL 获取数据");
return projectMapper.setProjectShow(setProjectShow);
}
public ProjectDO getProjectById(Long id) {
log.info("\t> 执行 DAO 层 ProjectDAO.getProjectById 方法");
log.info("\t\t> 从 MySQL 获取数据");
return projectMapper.getProjectById(id);
}
public List<ProjectDO> get(Long userId, List<String> tags, List<String> isFinish) {
log.info("\t> 执行 DAO 层 ProjectDAO.get 方法");
log.info("\t\t> 从 MySQL 获取数据");
if (tags != null && !tags.isEmpty()) {
log.info("tags");
return projectMapper.getByTags(userId, tags, isFinish);
}
if (isFinish != null && !isFinish.isEmpty()) {
log.info("finish");
return projectMapper.getByIsfinish(userId, isFinish);
}
@ -133,8 +112,6 @@ public class ProjectDAO {
}
public List<ProjectDO> workget(Long userId, List<String> tags, List<String> isFinish, Integer is) {
log.info("\t> 执行 DAO 层 ProjectDAO.workGet 方法");
log.info("\t\t> 从 MySQL 获取数据");
if (tags != null && !tags.isEmpty()) {
return projectMapper.workgetByTags(userId, tags, is, isFinish);
}
@ -147,34 +124,25 @@ public class ProjectDAO {
}
public ProjectDO getByName(String name) {
log.info("\t> 执行 DAO 层 ProjectDAO.getByName 方法");
log.info("\t\t> 从 MySQL 获取数据");
return projectMapper.getByName(name);
}
public boolean projectDelete(Long id) {
log.info("\t> 执行 DAO 层 ProjectDAO.projectDelete 方法");
log.info("\t\t> 从 MySQL 获取数据");
return projectMapper.deleteProject(id);
}
public boolean isExistProjectById(Long id) {
log.info("\t> 执行 DAO 层 ProjectDAO.isExistProjectById 方法");
log.info("\t\t> 从 MySQL 获取数据");
return projectMapper.getProjectById(id) != null;
}
public boolean isPrincipalUser(Long uid, Long projectId) {
log.info("\t> 执行 DAO 层 ProjectDAO.isPrincipalUser 方法");
log.info("\t\t> 从 MySQL 获取数据");
ProjectDO projectDO = projectMapper.getProjectById(projectId);
return Objects.equals(uid, projectDO.getPrincipalId());
}
public List<ProjectDO> tget(List<String> isFinish, List<String> tags) {
log.info("DAO层tget");
if (tags != null && !tags.isEmpty()) {
return projectMapper.tgetBytags(tags, isFinish);
@ -191,20 +159,14 @@ public class ProjectDAO {
}
public List<ProjectDO> getProjectByPrincipalUser(Long uid) {
log.info("\t> 执行 DAO 层 ProjectDAO.getProjectFromUser 方法");
log.info("\t\t> 从 MySQL 获取数据");
return projectMapper.getProjectByPrincipalUser(uid);
}
public List<ProjectModuleDO> getAllSubsystemByUserId(Long uid) {
log.info("\t> 执行 DAO 层 ProjectDAO.getAllSubsystemByUserId 方法");
log.info("\t\t> 从 MySQL 获取数据");
return projectMapper.getAllSubsystemByUserId(uid);
}
public List<ProjectModuleDO> getAllSubmoduleByUserId(Long uid) {
log.info("\t> 执行 DAO 层 ProjectDAO.getAllSubmoduleByUserId 方法");
log.info("\t\t> 从 MySQL 获取数据");
return projectMapper.getAllSubmoduleByUserId(uid);
}

25
src/main/java/com/jsl/oa/dao/RoleDAO.java
View File

@ -23,8 +23,6 @@ public class RoleDAO {
private final RoleRedisUtil<String> roleRedisUtil;
public void addRoleUser(Long uid, Long rid) {
log.info("\t> 执行 DAO 层 RoleDAO.addRoleUser 方法");
log.info("\t\t> 从 MySQL 获取数据");
roleMapper.roleAddUser(uid, rid);
roleRedisUtil.setData(
BusinessConstants.USER,
@ -35,20 +33,15 @@ public class RoleDAO {
}
public void delRoleUser(Long uid) {
log.info("\t> 执行 DAO 层 RoleDAO.delRoleUser 方法");
log.info("\t\t> 从 MySQL 获取数据");
roleMapper.roleRemoveUser(uid);
roleRedisUtil.delData(BusinessConstants.USER, uid.toString());
}
public RoleDO getRoleById(Long id) {
log.info("\t> 执行 DAO 层 RoleDAO.getRoleById 方法");
String getRedisData = roleRedisUtil.getData(BusinessConstants.NONE, "all");
if (getRedisData == null) {
log.info("\t\t> 从 MySQL 获取数据");
return roleMapper.getRoleById(id);
} else {
log.info("\t\t> 从 Redis 获取数据");
List<RoleDO> roleList = gson.fromJson(getRedisData, new TypeToken<List<RoleDO>>() {
}.getType());
for (RoleDO roleDO : roleList) {
@ -61,23 +54,18 @@ public class RoleDAO {
}
public List<RoleDO> getRole() {
log.info("\t> 执行 DAO 层 RoleDAO.getRole 方法");
String getRedisData = roleRedisUtil.getData(BusinessConstants.NONE, "all");
if (getRedisData == null) {
log.info("\t\t> 从 MySQL 获取数据");
List<RoleDO> roleList = roleMapper.getRole();
roleRedisUtil.setData(BusinessConstants.NONE, "all", gson.toJson(roleList), 1440);
return roleList;
} else {
log.info("\t\t> 从 Redis 获取数据");
return gson.fromJson(getRedisData, new TypeToken<List<RoleDO>>() {
}.getType());
}
}
public void roleAdd(RoleDO roleDO) {
log.info("\t> 执行 DAO 层 RoleDAO.roleAdd 方法");
log.info("\t\t> 从 MySQL 获取数据");
roleMapper.roleAdd(roleDO);
List<RoleDO> roleList = roleMapper.getRole();
roleRedisUtil.setData(BusinessConstants.NONE, "all", gson.toJson(roleList), 120);
@ -85,15 +73,11 @@ public class RoleDAO {
}
public RoleDO getRoleNameByUid(Long uid) {
log.info("\t> 执行 DAO 层 RoleDAO.getRoleNameByUid 方法");
log.info("\t\t> 从 MySQL 获取数据");
return roleMapper.getRoleById(getRoleUserByUid(uid).getRid());
}
public boolean roleEdit(RoleDO getRole) {
log.info("\t> 执行 DAO 层 RoleDAO.roleEdit 方法");
log.info("\t\t> 从 MySQL 获取数据");
if (roleMapper.roleEdit(getRole)) {
List<RoleDO> roleList = roleMapper.getRole();
roleRedisUtil.setData(BusinessConstants.NONE, "all", gson.toJson(roleList), 1440);
@ -104,8 +88,6 @@ public class RoleDAO {
}
public boolean roleDelete(Long id) {
log.info("\t> 执行 DAO 层 RoleDAO.roleDelete 方法");
log.info("\t\t> 从 MySQL 获取数据");
if (roleMapper.roleDelete(id)) {
List<RoleDO> roleList = roleMapper.getRole();
roleRedisUtil.setData(BusinessConstants.NONE, "all", gson.toJson(roleList), 1440);
@ -116,15 +98,11 @@ public class RoleDAO {
}
public boolean isExistRoleByRoleName(String roleName) {
log.info("\t> 执行 DAO 层 RoleDAO.isExistRoleByRoleName 方法");
log.info("\t\t> 从 MySQL 获取数据");
RoleDO roleDO = roleMapper.getRoleByRoleName(roleName);
return roleDO != null;
}
public boolean roleChangeUser(@NotNull Long uid, Long rid) {
log.info("\t> 执行 DAO 层 RoleDAO.roleChangeUser 方法");
log.info("\t\t> 从 MySQL 获取数据");
if (roleMapper.roleChangeUser(uid, rid)) {
roleRedisUtil.setData(
BusinessConstants.USER,
@ -139,13 +117,10 @@ public class RoleDAO {
}
public RoleUserDO getRoleUserByUid(@NotNull Long uid) {
log.info("\t> 执行 DAO 层 RoleDAO.getRoleUserByUid 方法");
String getRedisData = roleRedisUtil.getData(BusinessConstants.USER, uid.toString());
if (getRedisData == null) {
log.info("\t\t> 从 MySQL 获取数据");
return roleMapper.getRoleUserByUid(uid);
} else {
log.info("\t\t> 从 Redis 获取数据");
return gson.fromJson(getRedisData, RoleUserDO.class);
}
}

1
src/main/java/com/jsl/oa/dao/TagDAO.java
View File

@ -33,7 +33,6 @@ public class TagDAO {
* @param order 排序
*/
public ArrayList<TagProjectDO> getTagsProjectList(Integer page, Integer limit, String order) {
log.info("[DAO] 请求 getTagsProjectList 接口");
// 获取标签列表
page = (page - 1) * limit;
return (ArrayList<TagProjectDO>) tagMapper.getTagsProjectList(order, limit, page);

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

@ -50,7 +50,6 @@ public class UserDAO {
* @author 筱锋xiao_lfeng
*/
public UserDO getUserInfoByUsername(String username) {
log.info("\t> 执行 DAO 层 UserDAO.getUserInfoByUsername 方法");
UserDO userDO = null;
// 从 Redis 获取数据
// TODO: 10000-Redis: 从 Redis 获取数据
@ -70,15 +69,12 @@ public class UserDAO {
* @return Boolean
*/
public Boolean isExistUser(@NotNull Long id) {
log.info("\t> 执行 DAO 层 UserDAO.isExistUser 方法");
// 从 Redis 获取数据
String redisData = userRedisUtil.getData(BusinessConstants.NONE, id.toString());
if (redisData != null) {
log.info("\t\t> 从 Redis 获取数据");
return true;
} else {
UserDO userDO = userMapper.getUserById(id);
log.info("\t\t> 从 MySQL 获取数据");
if (userDO != null) {
userRedisUtil.setData(BusinessConstants.NONE, userDO.getId().toString(), gson.toJson(userDO), 120);
return true;
@ -96,20 +92,15 @@ public class UserDAO {
* @param id 用户id
*/
public void userDelete(@NotNull Long id) {
log.info("\t> 执行 DAO 层 UserDAO.userDelete 方法");
// Redis 获取数据
String redisData = userRedisUtil.getData(BusinessConstants.NONE, id.toString());
if (redisData != null) {
log.info("\t\t> 从 Redis 删除数据");
userRedisUtil.delData(BusinessConstants.NONE, id.toString());
}
log.info("\t\t> 从 MySQL 删除数据");
userMapper.userDelete(id);
}
public boolean userGetDelete(Long id) {
log.info("\t> 执行 DAO 层 UserDAO.userGetDelete 方法");
log.info("\t\t> 从 MySQL 获取数据");
return userMapper.userGetDelete(id);
}
@ -119,20 +110,14 @@ public class UserDAO {
* @param id
*/
public void userLock(Long id, Long isLock) {
log.info("\t> 执行 DAO 层 UserDAO.userLock 方法");
log.info("\t\t> 从 MySQL 获取数据");
userMapper.userLock(id, isLock);
}
public void userEditProfile(UserEditProfileVO userEditProfileVO) {
log.info("\t> 执行 DAO 层 UserDAO.userEditProfile 方法");
log.info("\t\t> 从 MySQL 获取数据");
userMapper.userEditProfile(userEditProfileVO);
}
public UserCurrentBackVO userCurrentAll(UserAllCurrentVO userAllCurrentVO) {
log.info("\t> 执行 DAO 层 UserDAO.userCurrentAll 方法");
log.info("\t\t> 从 MySQL 获取数据");
List<UserDO> userCurrentDO = userMapper.getAllUser(userAllCurrentVO);
UserCurrentBackVO userCurrentBackVO = new UserCurrentBackVO();
userCurrentBackVO.setUsers(new ArrayList<>())
@ -144,8 +129,6 @@ public class UserDAO {
}
public UserCurrentBackVO userCurrentAllLike(UserAllCurrentVO userAllCurrentVO) {
log.info("\t> 执行 DAO 层 UserDAO.userCurrentAllLike 方法");
log.info("\t\t> 从 MySQL 获取数据");
List<UserDO> userCurrentDO = userMapper.getAllUserBySearch(userAllCurrentVO);
UserCurrentBackVO userCurrentBackVO = new UserCurrentBackVO();
userCurrentBackVO.setUsers(new ArrayList<>())
@ -163,14 +146,10 @@ public class UserDAO {
* @Param userDO: user 数据库表实体类
*/
public boolean userAdd(UserDO userDO) {
log.info("\t> 执行 DAO 层 userAdd 方法");
log.info("\t\t> 从 MySQL 获取数据");
return userMapper.insertUser(userDO);
}
public void userEdit(UserDO userDO) {
log.info("\t> 执行 DAO 层 userEdit 方法");
log.info("\t\t> 从 MySQL 获取数据");
userMapper.updateUser(userDO);
}
@ -181,8 +160,6 @@ public class UserDAO {
* @Param username: 用户名
**/
public Boolean isRepeatUser(String username) {
log.info("\t> 执行 DAO 层 isRepeatUser 方法");
log.info("\t\t> 从 MySQL 获取数据");
return userMapper.getUserInfoByUsername(username) != null;
}
@ -205,8 +182,6 @@ public class UserDAO {
* @Param userId
**/
public UserDO getUserById(Long userId) {
log.info("\t> 执行 DAO 层 getUserById 方法");
log.info("\t\t> 从 MySQL 获取数据");
return userMapper.getUserById(userId);
}
@ -217,8 +192,6 @@ public class UserDAO {
* @Param uid:用户id
**/
public RoleUserDO getRoleFromUser(Long uid) {
log.info("\t> 执行 DAO 层 getRoleFromUser 方法");
log.info("\t\t> 从 MySQL 获取数据");
return userMapper.getRoleIdByUserId(uid);
}
@ -229,8 +202,6 @@ public class UserDAO {
* @Param null:用户id
**/
public Boolean isManagerByRoleId(Long roleId) {
log.info("\t> 执行 DAO 层 isManagerByRoleId 方法");
log.info("\t\t> 从 MySQL 获取数据");
RoleDO role = userMapper.getRoleById(roleId);
if (role == null) {
return false;
@ -240,26 +211,18 @@ public class UserDAO {
public List<UserDO> getRecommendUser() {
log.info("\t> 执行 DAO 层 getRecommendUser 方法");
log.info("\t\t> 从 MySQL 获取数据");
return userMapper.getRecommendUser();
}
public UserDO getUserByEmail(String email) {
log.info("\t> 执行 DAO 层 getUserByEmail 方法");
log.info("\t\t> 从 MySQL 获取数据");
return userMapper.getUserByEmail(email);
}
public UserDO getUserByPhone(String phone) {
log.info("\t> 执行 DAO 层 getUserByPhone 方法");
log.info("\t\t> 从 MySQL 获取数据");
return userMapper.getUserByPhone(phone);
}
public Long getUsersCount() {
log.info("\t> 执行 DAO 层 getUsersCount 方法");
log.info("\t\t> 从 MySQL 获取数据");
return userMapper.getUsersCount();
}
}

7
src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
View File

@ -49,7 +49,6 @@ public class AuthServiceImpl implements AuthService {
@Override
public BaseResponse authRegister(@NotNull UserRegisterVO userRegisterVO) {
log.info("\t> 执行 Service 层 AuthService.authRegister 方法");
// 检查用户说是否存在
UserDO getUserByUsername = userMapper.getUserInfoByUsername(userRegisterVO.getUsername());
// 用户名已存在
@ -86,7 +85,6 @@ public class AuthServiceImpl implements AuthService {
@Override
public BaseResponse authLogin(@NotNull UserLoginVO userLoginVO) {
log.info("\t> 执行 Service 层 AuthService.userLogin 方法");
// 检查用户是否存在
UserDO userDO;
if (Pattern.matches("^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$",
@ -131,7 +129,6 @@ public class AuthServiceImpl implements AuthService {
@Override
public BaseResponse authLoginByEmail(String email, Integer code) {
log.info("\t> 执行 Service 层 AuthService.authLoginByEmail 方法");
// 获取验证码是否有效
Integer redisCode = emailRedisUtil.getData(BusinessConstants.BUSINESS_LOGIN, email);
if (redisCode != null) {
@ -151,7 +148,6 @@ public class AuthServiceImpl implements AuthService {
@Override
public BaseResponse authLoginSendEmailCode(String email) {
log.info("\t> 执行 Service 层 AuthService.authLoginSendEmailCode 方法");
// 获取用户信息
UserDO userDO = userMapper.getUserInfoByEmail(email);
if (userDO != null) {
@ -181,7 +177,6 @@ public class AuthServiceImpl implements AuthService {
@NotNull UserChangePasswordVO userChangePasswordVO,
HttpServletRequest request
) {
log.info("\t> 执行 Service 层 AuthService.authChangePassword 方法");
// 检查新密码输入无误
if (!userChangePasswordVO.getNewPassword().equals(userChangePasswordVO.getConfirmPassword())) {
return ResultUtil.error(ErrorCode.PASSWORD_NOT_SAME);
@ -212,7 +207,6 @@ public class AuthServiceImpl implements AuthService {
@Override
@UserAbleToUse
public BaseResponse authLogout(HttpServletRequest request) {
log.info("\t> 执行 Service 层 AuthService.authLogout 方法");
// 获取用户
UserDO userDO = userMapper.getUserById(Processing.getAuthHeaderToUserId(request));
// 删除Token
@ -225,7 +219,6 @@ public class AuthServiceImpl implements AuthService {
@Override
public BaseResponse authForgetPassword(@NotNull UserForgetPasswordVO userForgetPasswordVO) {
log.info("\t> 执行 Service 层 AuthService.authForgetPassword 方法");
// 获取验证码是否有效
Integer redisCode = emailRedisUtil.getData(BusinessConstants.BUSINESS_LOGIN, userForgetPasswordVO.getEmail());
if (redisCode != null) {

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

@ -43,7 +43,6 @@ public class InfoServiceImpl implements InfoService {
@Override
@NeedRoleGroup("info.image.add")
public BaseResponse addHeaderImage(HttpServletRequest request, @NotNull CarouselVO carouselVO) {
log.info("\t> 执行 Service 层 InfoService.addHeaderImage 方法");
// 获取用户
Long userId = Processing.getAuthHeaderToUserId(request);
UserDO userDO = userDAO.getUserById(userId);
@ -77,7 +76,6 @@ public class InfoServiceImpl implements InfoService {
@Override
@NeedRoleGroup("info.image.edit")
public BaseResponse editHeaderImage(HttpServletRequest request, @NotNull CarouselVO carouselVO) {
log.info("\t> 执行 Service 层 InfoService.editHeaderImage 方法");
// 获取用户
Long userId = Processing.getAuthHeaderToUserId(request);
UserDO userDO = userDAO.getUserById(userId);
@ -112,7 +110,6 @@ public class InfoServiceImpl implements InfoService {
@Override
public BaseResponse getHeaderImage(Integer id) {
log.info("\t> 执行 Service 层 InfoService.getHeaderImage 方法");
// 获取轮播图信息
CarouselDO carouselDO = infoDAO.getCarousel();
if (id != null) {
@ -129,7 +126,6 @@ public class InfoServiceImpl implements InfoService {
@Override
@NeedRoleGroup("info.image.del")
public BaseResponse delHeaderImage(HttpServletRequest request, Integer id) {
log.info("\t> 执行 Service 层 InfoService.delHeaderImage 方法");
// 用户权限校验
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
return ResultUtil.error(ErrorCode.NOT_ADMIN);
@ -152,7 +148,6 @@ public class InfoServiceImpl implements InfoService {
@Override
@NeedRoleGroup("info.image.setting.edit")
public BaseResponse editSettingHeaderImage(HttpServletRequest request, Boolean showType) {
log.info("\t> 执行 Service 层 InfoService.editSettingHeaderImage 方法");
// 用户权限校验
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
return ResultUtil.error(ErrorCode.NOT_ADMIN);
@ -170,7 +165,6 @@ public class InfoServiceImpl implements InfoService {
@Override
public BaseResponse getHeaderUser(HttpServletRequest request, String order, String orderBy) {
log.info("\t> 执行 Service 层 InfoService.getHeaderUser 方法");
// 默认无参数情况
if (order == null) {
order = "asc";

6
src/main/java/com/jsl/oa/services/impl/MailServiceImpl.java
View File

@ -41,7 +41,6 @@ public class MailServiceImpl implements MailService {
@Async
@UserAbleToUse
public void sendMail(String sendTo, String subject, String text) {
log.info("\t> 执行 Service 层 MailService.sendMail 方法");
//发送多媒体邮件
try {
MimeMessage message = javaMailSender.createMimeMessage();
@ -64,15 +63,12 @@ public class MailServiceImpl implements MailService {
@Override
@Async
@UserAbleToUse
public void sendMail(String sendTo, String model) {
log.info("\t> 执行 Service 层 MailService.sendMail 方法");
}
public void sendMail(String sendTo, String model) { }
@Override
@Async
@UserAbleToUse
public void sendMailAboutUserLogin(String email, Integer code) {
log.info("\t> 执行 Service 层 MailService.sendMailAboutUserLogin 方法");
// 发送邮件带HTML模块部分
try {
MimeMessage message = javaMailSender.createMimeMessage();

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

@ -30,7 +30,6 @@ public class ModuleServiceImpl implements ModuleService {
@Override
public BaseResponse getByProjectId(Integer projectId, HttpServletRequest request) {
log.info("projectService");
//获取用户id
Long userId = Processing.getAuthHeaderToUserId(request);
//获取项目负责人id
@ -48,7 +47,6 @@ public class ModuleServiceImpl implements ModuleService {
@Override
public BaseResponse getBySysId(Integer sysId, HttpServletRequest request) {
log.info("SysService");
//获取用户id
Long userId = Processing.getAuthHeaderToUserId(request);
//获取子系统负责人id

1
src/main/java/com/jsl/oa/services/impl/NewsServiceImpl.java
View File

@ -37,7 +37,6 @@ public class NewsServiceImpl implements NewsService {
@Override
@NeedRoleGroup("news.add")
public BaseResponse newsAdd(NewsAddVO newsAddVO, @NotNull HttpServletRequest request) {
log.info("\t> 执行 Service 层 NewsService.newsAdd 方法");
// 拷贝新闻数据到实体类
NewsDO newsDO = new NewsDO();
Processing.copyProperties(newsAddVO, newsDO);

5
src/main/java/com/jsl/oa/services/impl/PermissionServiceImpl.java
View File

@ -43,7 +43,6 @@ public class PermissionServiceImpl implements PermissionService {
@Override
@NeedRoleGroup("permission.add")
public BaseResponse permissionAdd(HttpServletRequest request, Long rid, Long pid) {
log.info("\t> 执行 Service 层 PermissionService.permissionAdd 方法");
permissionMapper.permissionAdd(rid, pid);
return ResultUtil.success();
}
@ -51,7 +50,6 @@ public class PermissionServiceImpl implements PermissionService {
@Override
@NeedRoleGroup("permission.user")
public BaseResponse permissionUser(HttpServletRequest request, Long uid) {
log.info("\t> 执行 Service 层 PermissionService.permissionUserPid 方法");
if (userDAO.isExistUser(uid)) {
// 此用户是否为管理员
RoleUserDO roleUserDO = roleDAO.getRoleUserByUid(uid);
@ -72,7 +70,6 @@ public class PermissionServiceImpl implements PermissionService {
@Override
@NeedRoleGroup("permission.get")
public BaseResponse permissionGet(HttpServletRequest request) {
log.info("\t> 执行 Service 层 PermissionService.permissionGet 方法");
//获取所有权限数据
List<PermissionDO> permissionDOList = permissionMapper.getAllPermission();
//将数据按父子类封装
@ -84,7 +81,6 @@ public class PermissionServiceImpl implements PermissionService {
@Override
@NeedRoleGroup("permission.edit")
public BaseResponse permissionEdit(PermissionEditVO permissionEditVo, HttpServletRequest request) {
log.info("\t> 执行 Service 层 PermissionService.permissionEdit 方法");
//根据id获取对应permission数据
PermissionDO permissionDO = permissionMapper.getPermissionById(permissionEditVo.getId());
if (permissionDO == null) {
@ -102,7 +98,6 @@ public class PermissionServiceImpl implements PermissionService {
@Override
@NeedRoleGroup("permission.delete")
public BaseResponse permissionDelete(HttpServletRequest request, Long pid) {
log.info("\t> 执行 Service 层 PermissionService.permissionDelete 方法");
//删除权限
if (!permissionMapper.deletePermission(pid)) {
return ResultUtil.error(ErrorCode.DATABASE_DELETE_ERROR);

10
src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java
View File

@ -54,7 +54,6 @@ public class ProjectServiceImpl implements ProjectService {
@Override
public BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd) {
log.info("\t> 执行 Service 层 ProjectService.projectAdd 方法");
if (projectAdd.getDescription().isEmpty()) {
projectAdd.setDescription("{}");
} else {
@ -81,7 +80,6 @@ public class ProjectServiceImpl implements ProjectService {
@Override
public BaseResponse projectWorkAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO) {
log.info("\t> 执行 Service 层 ProjectService.projectWorkAdd 方法");
//获取用户id
Long userId = Processing.getAuthHeaderToUserId(request);
//是否是增加子系统
@ -106,7 +104,6 @@ public class ProjectServiceImpl implements ProjectService {
@Override
public BaseResponse tGet(List<String> tags, List<String> isFinish, Integer page, Integer pageSize) {
log.info("\t> 执行 Service 层 ProjectService.tGet 方法");
List<ProjectDO> projectDOList = projectDAO.tget(isFinish, tags);
@ -201,7 +198,6 @@ public class ProjectServiceImpl implements ProjectService {
@Override
public BaseResponse projectEdit(HttpServletRequest request, @NotNull ProjectEditVO projectEdit, Long projectId) {
log.info("\t> 执行 Service 层 ProjectService.projectEdit 方法");
//判断用户是否为老师 或者 项目负责人
@ -238,7 +234,6 @@ public class ProjectServiceImpl implements ProjectService {
@Override
@NeedRoleGroup("info.project.add")
public BaseResponse addHeader(HttpServletRequest request, ProjectShowVO projectShowVO) {
log.info("\t> 执行 Service 层 InfoService.addHeader 方法");
// 获取用户
Long userId = Processing.getAuthHeaderToUserId(request);
UserDO userDO = userDAO.getUserById(userId);
@ -265,7 +260,6 @@ public class ProjectServiceImpl implements ProjectService {
@Override
@NeedRoleGroup("info.project.del")
public BaseResponse delHeader(Integer id, HttpServletRequest request) {
log.info("\t> 执行 Service 层 InfoService.delHeader 方法");
// 获取展示信息
ProjectShowDO projectShowDO = projectDAO.getHeader();
// 删除指定展示id
@ -284,7 +278,6 @@ public class ProjectServiceImpl implements ProjectService {
@Override
@NeedRoleGroup("info.project.edit")
public BaseResponse editHeader(HttpServletRequest request, ProjectShowVO projectShowVO, Integer id) {
log.info("\t> 执行 Service 层 InfoService.editHeader 方法");
// 获取用户
Long userId = Processing.getAuthHeaderToUserId(request);
UserDO userDO = userDAO.getUserById(userId);
@ -319,7 +312,6 @@ public class ProjectServiceImpl implements ProjectService {
Integer page,
Integer pageSize
) {
log.info("\t> 执行 Service 层 ProjectService.workGet 方法");
//获取用户
Long userId = Processing.getAuthHeaderToUserId(request);
@ -342,7 +334,6 @@ public class ProjectServiceImpl implements ProjectService {
@Override
public BaseResponse getByName(String name) {
log.info("\t> 执行 Service 层 ProjectService.getByName 方法");
if (projectDAO.getByName(name) == null) {
return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST);
} else {
@ -352,7 +343,6 @@ public class ProjectServiceImpl implements ProjectService {
@Override
public BaseResponse projectDelete(HttpServletRequest request, List<Long> id) {
log.info("\t> 执行 Service 层 ProjectService.projectDelete 方法");
//判断用户是否为老师 或者 项目负责人
if (!Processing.checkUserIsTeacher(request, roleDAO)) {

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

@ -37,8 +37,6 @@ public class ReviewServiceImpl implements ReviewService {
@Override
public BaseResponse getUserReview(Long projectId, HttpServletRequest request) {
log.info("\t> 执行 Service 层 ReviewService.getUserReview 方法");
//获取用户
Long userId = Processing.getAuthHeaderToUserId(request);

7
src/main/java/com/jsl/oa/services/impl/RoleServiceImpl.java
View File

@ -44,7 +44,6 @@ public class RoleServiceImpl implements RoleService {
@Override
@NeedRoleGroup("role.add")
public BaseResponse roleAddUser(HttpServletRequest request, Long uid, Long rid) {
log.info("\t> 执行 Service 层 RoleService.addRoleUser 方法");
if (Processing.checkUserIsAdmin(request, roleDAO)) {
roleDAO.addRoleUser(uid, rid);
return ResultUtil.success();
@ -56,7 +55,6 @@ public class RoleServiceImpl implements RoleService {
@Override
public BaseResponse roleRemoveUser(HttpServletRequest request, Long uid) {
log.info("\t> 执行 Service 层 RoleService.delRoleUser 方法");
if (Processing.checkUserIsAdmin(request, roleDAO)) {
roleDAO.delRoleUser(uid);
return ResultUtil.success();
@ -67,7 +65,6 @@ public class RoleServiceImpl implements RoleService {
@Override
public BaseResponse roleChangeUser(HttpServletRequest request, Long uid, Long rid) {
log.info("\t> 执行 Service 层 RoleService.roleChangeUser 方法");
//检测用户是否存在
if (!userDAO.isExistUser(uid)) {
return ResultUtil.error(ErrorCode.USER_NOT_EXIST);
@ -90,7 +87,6 @@ public class RoleServiceImpl implements RoleService {
@Override
public BaseResponse roleGet(HttpServletRequest request, String id) {
log.info("\t> 执行 Service 层 RoleService.roleGet 方法");
// 检查用户权限
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
return ResultUtil.error(ErrorCode.NOT_ADMIN);
@ -117,7 +113,6 @@ public class RoleServiceImpl implements RoleService {
@Override
public BaseResponse roleEdit(HttpServletRequest request, RoleEditVO roleEditVO) {
log.info("\t> 执行 Service 层 RoleService.roleEdit 方法");
// 检查用户权限
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
return ResultUtil.error(ErrorCode.NOT_ADMIN);
@ -141,7 +136,6 @@ public class RoleServiceImpl implements RoleService {
@Override
public BaseResponse roleDelete(HttpServletRequest request, Long id) {
log.info("\t> 执行 Service 层 RoleService.roleDelete 方法");
// 检查用户权限
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
return ResultUtil.error(ErrorCode.NOT_ADMIN);
@ -163,7 +157,6 @@ public class RoleServiceImpl implements RoleService {
@Override
public BaseResponse addRole(HttpServletRequest request, RoleAddVo roleAddVO) throws ClassCopyException {
log.info("\t> 执行 Service 层 RoleService.addRole 方法");
// 检查用户权限
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
return ResultUtil.error(ErrorCode.NOT_ADMIN);

1
src/main/java/com/jsl/oa/services/impl/TagServiceImpl.java
View File

@ -37,7 +37,6 @@ public class TagServiceImpl implements TagService {
*/
@Override
public BaseResponse getTagsProjectList(Integer page, Integer limit, String order) {
log.info("[Service] 请求 getTagsProjectList 接口");
// 获取标签列表
ArrayList<TagProjectDO> getTagList = tagDAO.getTagsProjectList(page, limit, order);
return ResultUtil.success(getTagList);

9
src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
View File

@ -52,7 +52,6 @@ public class UserServiceImpl implements UserService {
@Override
public BaseResponse userDelete(HttpServletRequest request, Long id) {
log.info("\t> 执行 Service 层 UserService.userDelete 方法");
//判断用户是否存在
if (userDAO.isExistUser(id)) {
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
@ -72,7 +71,6 @@ public class UserServiceImpl implements UserService {
@Override
public BaseResponse userLock(HttpServletRequest request, Long id, Long isLock) {
log.info("\t> 执行 Service 层 UserService.userLock 方法");
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
return ResultUtil.error(ErrorCode.NOT_ADMIN);
}
@ -87,7 +85,6 @@ public class UserServiceImpl implements UserService {
@Override
public BaseResponse userEditProfile(@NotNull UserEditProfileVO userEditProfileVO) {
log.info("\t> 执行 Service 层 UserService.userEditProfile 方法");
if (userDAO.isExistUser(userEditProfileVO.getId())) {
userDAO.userEditProfile(userEditProfileVO);
return ResultUtil.success("修改成功");
@ -99,7 +96,6 @@ public class UserServiceImpl implements UserService {
@Override
@NeedRoleGroup("user.current.all")
public BaseResponse userCurrentAll(HttpServletRequest request, @NotNull UserAllCurrentVO userAllCurrentVO) {
log.info("\t> 执行 Service 层 UserService.userCurrentAll 方法");
// 检查数据
if (userAllCurrentVO.getPage() == null || userAllCurrentVO.getPage() < 1) {
userAllCurrentVO.setPage(1L);
@ -139,7 +135,6 @@ public class UserServiceImpl implements UserService {
String username,
String email,
String phone) {
log.info("\t> 执行 Service 层 UserService.userCurrent 方法");
if (id == null && username == null && email == null && phone == null) {
// Token获取信息
UserDO userDO = userDAO.getUserById(Processing.getAuthHeaderToUserId(request));
@ -193,7 +188,6 @@ public class UserServiceImpl implements UserService {
@Override
public BaseResponse userAdd(UserAddVO userAddVo, HttpServletRequest request) {
log.info("\t> 执行 Service 层 UserService.userAdd 方法");
// 检测用户是否为管理员
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
return ResultUtil.error(ErrorCode.NOT_ADMIN);
@ -231,7 +225,6 @@ public class UserServiceImpl implements UserService {
@Override
public BaseResponse userEdit(UserEditVO userEditVO, HttpServletRequest request) {
log.info("\t> 执行 Service 层 userEdit 方法");
// 检测用户是否为管理员
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
return ResultUtil.error(ErrorCode.NOT_ADMIN);
@ -265,8 +258,6 @@ public class UserServiceImpl implements UserService {
@Override
public BaseResponse userProfileGet(HttpServletRequest request) {
log.info("\t> 执行 Service 层 UserService.userProfileGet 方法");
// 获取用户Id
UserDO userDO = userDAO.getUserById(Processing.getAuthHeaderToUserId(request));
UserProfileVo userProfileVo = new UserProfileVo();