This commit is contained in:
parent
7b1cead10e
commit
76a1cf758c
|
@ -3,6 +3,8 @@ package com.jsl.oa.aspect;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.aspectj.lang.JoinPoint;
|
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.Aspect;
|
||||||
import org.aspectj.lang.annotation.Before;
|
import org.aspectj.lang.annotation.Before;
|
||||||
import org.aspectj.lang.reflect.MethodSignature;
|
import org.aspectj.lang.reflect.MethodSignature;
|
||||||
|
@ -44,9 +46,16 @@ public class BusinessAop {
|
||||||
HttpServletRequest request = servletRequestAttributes.getRequest();
|
HttpServletRequest request = servletRequestAttributes.getRequest();
|
||||||
// 获取方法签名
|
// 获取方法签名
|
||||||
MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
|
MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
|
||||||
|
Class<?> declaringType = methodSignature.getDeclaringType();
|
||||||
String methodName = methodSignature.getName();
|
String methodName = methodSignature.getName();
|
||||||
|
|
||||||
log.info("[CONTROL] 执行 {} 接口 | 地址: [{}]{}", methodName, request.getMethod(), request.getServletPath());
|
log.info(
|
||||||
|
"[CONTROL] 执行 {}:{} 接口 | 地址: [{}]{}",
|
||||||
|
declaringType.getName(),
|
||||||
|
methodName,
|
||||||
|
request.getMethod(),
|
||||||
|
request.getServletPath()
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
throw new RuntimeException("无法获取信息");
|
throw new RuntimeException("无法获取信息");
|
||||||
}
|
}
|
||||||
|
@ -61,25 +70,31 @@ public class BusinessAop {
|
||||||
public void beforeService(@NotNull JoinPoint joinPoint) {
|
public void beforeService(@NotNull JoinPoint joinPoint) {
|
||||||
// 获取方法签名
|
// 获取方法签名
|
||||||
MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
|
MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
|
||||||
|
Class<?> declaringType = methodSignature.getDeclaringType();
|
||||||
String methodName = methodSignature.getName();
|
String methodName = methodSignature.getName();
|
||||||
|
|
||||||
log.info("[SERVICE] 执行 {} 业务", methodName);
|
log.info("[SERVICE] 执行 {}:{} 业务", declaringType.getName(), methodName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 在DAO的所有方法执行前执行
|
* 在DAO的所有方法执行前执行
|
||||||
*
|
*
|
||||||
* @param joinPoint 切入点提供对方法执行的信息
|
* @param pjp 切入点提供对方法执行的信息
|
||||||
*/
|
*/
|
||||||
@Before("execution(* com.jsl.oa.dao.*.*(..))")
|
@Around("execution(* com.jsl.oa.dao.*.*(..))")
|
||||||
public void beforeDao(@NotNull JoinPoint joinPoint) {
|
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();
|
String methodName = methodSignature.getName();
|
||||||
Object[] args = joinPoint.getArgs();
|
Object[] args = pjp.getArgs();
|
||||||
log.info("[DAO] 操作 {} 记录", methodName);
|
log.info("==>[DAO] 操作 {}:{} 记录", declaringType.getName(), methodName);
|
||||||
if (args.length != 0) {
|
if (args.length != 0) {
|
||||||
log.debug("\t> 传入信息:{}", Arrays.toString(args));
|
log.debug("\t> 传入信息:{}", Arrays.toString(args));
|
||||||
}
|
}
|
||||||
|
Object result = pjp.proceed();
|
||||||
|
log.info("<==[DAO] 返回数据类型 {}", declaringType.descriptorString());
|
||||||
|
log.debug("\t> 传出信息:{}", result.toString());
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,6 @@ public class AuthController {
|
||||||
@RequestBody @Validated UserRegisterVO userRegisterVO,
|
@RequestBody @Validated UserRegisterVO userRegisterVO,
|
||||||
@NotNull BindingResult bindingResult
|
@NotNull BindingResult bindingResult
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[POST]: /auth/register");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -79,8 +78,6 @@ public class AuthController {
|
||||||
@RequestBody @Validated UserLoginVO userLoginVO,
|
@RequestBody @Validated UserLoginVO userLoginVO,
|
||||||
@NotNull BindingResult bindingResult
|
@NotNull BindingResult bindingResult
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[POST]: /auth/login");
|
|
||||||
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -100,7 +97,6 @@ public class AuthController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/auth/email/code")
|
@GetMapping("/auth/email/code")
|
||||||
public BaseResponse authSendEmailCode(@RequestParam String email) {
|
public BaseResponse authSendEmailCode(@RequestParam String email) {
|
||||||
log.info("请求接口[GET]: /auth/email/code");
|
|
||||||
if (email != null) {
|
if (email != null) {
|
||||||
if (Pattern.matches("^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", email)) {
|
if (Pattern.matches("^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", email)) {
|
||||||
return authService.authLoginSendEmailCode(email);
|
return authService.authLoginSendEmailCode(email);
|
||||||
|
@ -125,7 +121,6 @@ public class AuthController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/auth/login/email")
|
@GetMapping("/auth/login/email")
|
||||||
public BaseResponse authLoginByEmail(@RequestParam String email, @RequestParam String code) {
|
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 (email != null && code != null && !email.isEmpty() && !code.isEmpty()) {
|
||||||
if (Pattern.matches("^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", email)) {
|
if (Pattern.matches("^\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*$", email)) {
|
||||||
try {
|
try {
|
||||||
|
@ -152,7 +147,6 @@ public class AuthController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/auth/logout")
|
@GetMapping("/auth/logout")
|
||||||
public BaseResponse authLogout(HttpServletRequest request) {
|
public BaseResponse authLogout(HttpServletRequest request) {
|
||||||
log.info("请求接口[GET]: /auth/logout");
|
|
||||||
return authService.authLogout(request);
|
return authService.authLogout(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -173,7 +167,6 @@ public class AuthController {
|
||||||
@NotNull BindingResult bindingResult,
|
@NotNull BindingResult bindingResult,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[PUT]: /auth/password");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -191,7 +184,6 @@ public class AuthController {
|
||||||
@RequestBody @Validated UserForgetPasswordVO userForgetPasswordVO,
|
@RequestBody @Validated UserForgetPasswordVO userForgetPasswordVO,
|
||||||
@NotNull BindingResult bindingResult
|
@NotNull BindingResult bindingResult
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[PUT]: /auth/password/forget");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
|
|
@ -35,7 +35,6 @@ public class IndexController {
|
||||||
*/
|
*/
|
||||||
@RequestMapping("/")
|
@RequestMapping("/")
|
||||||
public BaseResponse index() {
|
public BaseResponse index() {
|
||||||
log.info("请求接口[GET]: /");
|
|
||||||
HashMap<String, String> newMap = new HashMap<>();
|
HashMap<String, String> newMap = new HashMap<>();
|
||||||
newMap.put("timestamp", "构建时间:" + timestamp);
|
newMap.put("timestamp", "构建时间:" + timestamp);
|
||||||
return ResultUtil.success("欢迎使用JSL-OA系统,服务器处于正常状态", newMap);
|
return ResultUtil.success("欢迎使用JSL-OA系统,服务器处于正常状态", newMap);
|
||||||
|
|
|
@ -42,7 +42,6 @@ public class InfoController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/info/header-image/get")
|
@GetMapping("/info/header-image/get")
|
||||||
public BaseResponse infoGetHeaderImage(@RequestParam(required = false) Integer id) {
|
public BaseResponse infoGetHeaderImage(@RequestParam(required = false) Integer id) {
|
||||||
log.info("请求接口[GET]: /info/header-image/get");
|
|
||||||
return infoService.getHeaderImage(id);
|
return infoService.getHeaderImage(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -60,7 +59,6 @@ public class InfoController {
|
||||||
HttpServletRequest request,
|
HttpServletRequest request,
|
||||||
@NotNull BindingResult bindingResult
|
@NotNull BindingResult bindingResult
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[PUT]: /info/header-image/edit");
|
|
||||||
// 参数校验
|
// 参数校验
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
log.warn("参数校验失败: {}", Processing.getValidatedErrorList(bindingResult));
|
log.warn("参数校验失败: {}", Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -82,7 +80,6 @@ public class InfoController {
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("/info/header-image/del")
|
@DeleteMapping("/info/header-image/del")
|
||||||
public BaseResponse infoDelHeaderImage(@RequestParam Integer id, HttpServletRequest request) {
|
public BaseResponse infoDelHeaderImage(@RequestParam Integer id, HttpServletRequest request) {
|
||||||
log.info("请求接口[DELETE]: /info/header-image/del");
|
|
||||||
return infoService.delHeaderImage(request, id);
|
return infoService.delHeaderImage(request, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -100,7 +97,6 @@ public class InfoController {
|
||||||
HttpServletRequest request,
|
HttpServletRequest request,
|
||||||
@NotNull BindingResult bindingResult
|
@NotNull BindingResult bindingResult
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[POST]: /info/header-image/add");
|
|
||||||
// 参数校验
|
// 参数校验
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
log.warn("参数校验失败: {}", Processing.getValidatedErrorList(bindingResult));
|
log.warn("参数校验失败: {}", Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -118,7 +114,6 @@ public class InfoController {
|
||||||
*/
|
*/
|
||||||
@PutMapping("/info/header-image/edit-setting")
|
@PutMapping("/info/header-image/edit-setting")
|
||||||
public BaseResponse infoEditSettingHeaderImage(@RequestParam Boolean showType, HttpServletRequest request) {
|
public BaseResponse infoEditSettingHeaderImage(@RequestParam Boolean showType, HttpServletRequest request) {
|
||||||
log.info("请求接口[PUT]: /info/header-image/edit-setting");
|
|
||||||
return infoService.editSettingHeaderImage(request, showType);
|
return infoService.editSettingHeaderImage(request, showType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -136,7 +131,6 @@ public class InfoController {
|
||||||
@RequestParam String orderBy,
|
@RequestParam String orderBy,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[GET]: /info/header-user/get");
|
|
||||||
return infoService.getHeaderUser(request, order, orderBy);
|
return infoService.getHeaderUser(request, order, orderBy);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 begin,
|
||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime end,
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime end,
|
||||||
HttpServletRequest request) {
|
HttpServletRequest request) {
|
||||||
log.info("请求接口[GET]:/message/get");
|
|
||||||
String token = request.getHeader("Authorization").replace("Bearer ", "");
|
String token = request.getHeader("Authorization").replace("Bearer ", "");
|
||||||
Long uid = JwtUtil.getUserId(token);
|
Long uid = JwtUtil.getUserId(token);
|
||||||
if (uid == null) {
|
if (uid == null) {
|
||||||
|
@ -79,7 +78,6 @@ public class MessageController {
|
||||||
public BaseResponse messageGetById(
|
public BaseResponse messageGetById(
|
||||||
@RequestParam Long id,
|
@RequestParam Long id,
|
||||||
HttpServletRequest request) {
|
HttpServletRequest request) {
|
||||||
log.info("请求接口[GET]:/message/get/id");
|
|
||||||
String token = request.getHeader("Authorization").replace("Bearer ", "");
|
String token = request.getHeader("Authorization").replace("Bearer ", "");
|
||||||
Long uid = JwtUtil.getUserId(token);
|
Long uid = JwtUtil.getUserId(token);
|
||||||
if (uid == null) {
|
if (uid == null) {
|
||||||
|
|
|
@ -33,8 +33,6 @@ public class ModuleController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/module/get")
|
@GetMapping("/module/get")
|
||||||
public BaseResponse moduleGetByProjectId(@RequestParam Integer projectId, HttpServletRequest request) {
|
public BaseResponse moduleGetByProjectId(@RequestParam Integer projectId, HttpServletRequest request) {
|
||||||
|
|
||||||
log.info("[Controller] 执行 moduleGetByProjectId 接口");
|
|
||||||
return moduleService.getByProjectId(projectId, request);
|
return moduleService.getByProjectId(projectId, request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,8 +45,6 @@ public class ModuleController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/module/get/min")
|
@GetMapping("/module/get/min")
|
||||||
public BaseResponse moduleGetBySysId(@RequestParam Integer sysId, HttpServletRequest request) {
|
public BaseResponse moduleGetBySysId(@RequestParam Integer sysId, HttpServletRequest request) {
|
||||||
|
|
||||||
log.info("[Controller] 执行 moduleGetBySysId 接口");
|
|
||||||
return moduleService.getBySysId(sysId, request);
|
return moduleService.getBySysId(sysId, request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -61,7 +57,6 @@ public class ModuleController {
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("/module/delete/{id}")
|
@DeleteMapping("/module/delete/{id}")
|
||||||
public BaseResponse moduleDeleteById(@PathVariable("id") Long id, HttpServletRequest request) {
|
public BaseResponse moduleDeleteById(@PathVariable("id") Long id, HttpServletRequest request) {
|
||||||
log.info("[Controller] 执行 moduleDeleteById 接口");
|
|
||||||
return moduleService.deleteById(request, id);
|
return moduleService.deleteById(request, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,6 @@ public class NewsController {
|
||||||
BindingResult bindingResult,
|
BindingResult bindingResult,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[POST]: /news/add");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
|
|
@ -40,7 +40,6 @@ public class PermissionController {
|
||||||
*/
|
*/
|
||||||
@PostMapping("/permission/add")
|
@PostMapping("/permission/add")
|
||||||
public BaseResponse permissionAdd(HttpServletRequest request, @RequestParam Long rid, @RequestParam Long pid) {
|
public BaseResponse permissionAdd(HttpServletRequest request, @RequestParam Long rid, @RequestParam Long pid) {
|
||||||
log.info("请求接口[POST]: /permission/add");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (rid == null || pid == null) {
|
if (rid == null || pid == null) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
||||||
|
@ -58,7 +57,6 @@ public class PermissionController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/permission/current")
|
@GetMapping("/permission/current")
|
||||||
public BaseResponse permissionUser(HttpServletRequest request, @RequestParam Long uid) {
|
public BaseResponse permissionUser(HttpServletRequest request, @RequestParam Long uid) {
|
||||||
log.info("请求接口[GET]: /permission/current");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (uid == null) {
|
if (uid == null) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
||||||
|
@ -75,7 +73,6 @@ public class PermissionController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/permission/get")
|
@GetMapping("/permission/get")
|
||||||
public BaseResponse permissionGet(HttpServletRequest request) {
|
public BaseResponse permissionGet(HttpServletRequest request) {
|
||||||
log.info("请求接口[GET]: /permission/get");
|
|
||||||
return permissionService.permissionGet(request);
|
return permissionService.permissionGet(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,7 +90,6 @@ public class PermissionController {
|
||||||
BindingResult bindingResult,
|
BindingResult bindingResult,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[PUT]: /permission/edit");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -110,7 +106,6 @@ public class PermissionController {
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("/permission/delete")
|
@DeleteMapping("/permission/delete")
|
||||||
public BaseResponse permissionDelete(@RequestParam Long pid, HttpServletRequest request) {
|
public BaseResponse permissionDelete(@RequestParam Long pid, HttpServletRequest request) {
|
||||||
log.info("请求接口[Delete]: /permission/delete");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (pid == null) {
|
if (pid == null) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
||||||
|
|
|
@ -46,7 +46,6 @@ public class ProjectController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/project/header/get")
|
@GetMapping("/project/header/get")
|
||||||
public BaseResponse projectGetHeader(@RequestParam(required = false) final Integer id) {
|
public BaseResponse projectGetHeader(@RequestParam(required = false) final Integer id) {
|
||||||
log.info("请求接口[GET]: /project/header/get");
|
|
||||||
return projectService.getHeader(id);
|
return projectService.getHeader(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,8 +78,8 @@ public class ProjectController {
|
||||||
@RequestParam(required = false) List<String> tags,
|
@RequestParam(required = false) List<String> tags,
|
||||||
@RequestParam(required = false) List<String> isFinish,
|
@RequestParam(required = false) List<String> isFinish,
|
||||||
@RequestParam(required = false, defaultValue = "1") Integer page,
|
@RequestParam(required = false, defaultValue = "1") Integer page,
|
||||||
@RequestParam(required = false, defaultValue = "10") Integer pageSize) {
|
@RequestParam(required = false, defaultValue = "10") Integer pageSize
|
||||||
log.info("请求接口[GET]: /project/get/custom");
|
) {
|
||||||
return projectService.tGet(tags, isFinish, page, pageSize);
|
return projectService.tGet(tags, isFinish, page, pageSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -98,7 +97,6 @@ public class ProjectController {
|
||||||
@PathVariable String projectId,
|
@PathVariable String projectId,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[GET]: /project/get");
|
|
||||||
// 对 projectId 进行判断
|
// 对 projectId 进行判断
|
||||||
if (!projectId.matches("^[0-9]+$")) {
|
if (!projectId.matches("^[0-9]+$")) {
|
||||||
return ResultUtil.error("参数 projectId 不是一个数字", ErrorCode.PARAMETER_ERROR);
|
return ResultUtil.error("参数 projectId 不是一个数字", ErrorCode.PARAMETER_ERROR);
|
||||||
|
@ -118,8 +116,8 @@ public class ProjectController {
|
||||||
@RequestParam(required = false) Integer is,
|
@RequestParam(required = false) Integer is,
|
||||||
@RequestParam(required = false, defaultValue = "1") Integer page,
|
@RequestParam(required = false, defaultValue = "1") Integer page,
|
||||||
@RequestParam(required = false, defaultValue = "10") Integer pageSize,
|
@RequestParam(required = false, defaultValue = "10") Integer pageSize,
|
||||||
HttpServletRequest request) {
|
HttpServletRequest request
|
||||||
log.info("请求接口[GET]: /project/work/get");
|
) {
|
||||||
return projectService.workGet(request, tags, isFinish, is, page, pageSize);
|
return projectService.workGet(request, tags, isFinish, is, page, pageSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -132,7 +130,6 @@ public class ProjectController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/project/header")
|
@GetMapping("/project/header")
|
||||||
public BaseResponse projectGetByName(@RequestParam String name) {
|
public BaseResponse projectGetByName(@RequestParam String name) {
|
||||||
log.info("请求接口[GET]: /project/header");
|
|
||||||
return projectService.getByName(name);
|
return projectService.getByName(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -146,10 +143,11 @@ public class ProjectController {
|
||||||
* @return {@link BaseResponse}
|
* @return {@link BaseResponse}
|
||||||
*/
|
*/
|
||||||
@PostMapping("/project/header/add")
|
@PostMapping("/project/header/add")
|
||||||
public BaseResponse projectAddHeader(@RequestBody @Validated ProjectShowVO projectShowVO,
|
public BaseResponse projectAddHeader(
|
||||||
HttpServletRequest request,
|
@RequestBody @Validated ProjectShowVO projectShowVO,
|
||||||
@NotNull BindingResult bindingResult) {
|
HttpServletRequest request,
|
||||||
log.info("请求接口[POST]: /project/header/add");
|
@NotNull BindingResult bindingResult
|
||||||
|
) {
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -168,11 +166,12 @@ public class ProjectController {
|
||||||
* @return {@link BaseResponse}
|
* @return {@link BaseResponse}
|
||||||
*/
|
*/
|
||||||
@PutMapping("/project/header/edit/{projectId}")
|
@PutMapping("/project/header/edit/{projectId}")
|
||||||
public BaseResponse projectEditById(@RequestParam Long projectId,
|
public BaseResponse projectEditById(
|
||||||
@RequestBody @Validated ProjectEditVO projectEdit,
|
@PathVariable Long projectId,
|
||||||
@NotNull BindingResult bindingResult,
|
@RequestBody @Validated ProjectEditVO projectEdit,
|
||||||
HttpServletRequest request) {
|
@NotNull BindingResult bindingResult,
|
||||||
log.info("请求接口[PUT]: /project/header/edit/{projectId}");
|
HttpServletRequest request
|
||||||
|
) {
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -188,10 +187,11 @@ public class ProjectController {
|
||||||
* @return {@link BaseResponse}
|
* @return {@link BaseResponse}
|
||||||
*/
|
*/
|
||||||
@PostMapping("/project/work/add")
|
@PostMapping("/project/work/add")
|
||||||
public BaseResponse projectWorkAdd(HttpServletRequest request,
|
public BaseResponse projectWorkAdd(
|
||||||
@RequestBody @Validated ProjectWorkVO projectWorkVO,
|
HttpServletRequest request,
|
||||||
@NotNull BindingResult bindingResult) {
|
@RequestBody @Validated ProjectWorkVO projectWorkVO,
|
||||||
log.info("请求接口[POST]: /project/work/add");
|
@NotNull BindingResult bindingResult
|
||||||
|
) {
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -210,10 +210,11 @@ public class ProjectController {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@PostMapping("/project/add")
|
@PostMapping("/project/add")
|
||||||
public BaseResponse projectAdd(HttpServletRequest request,
|
public BaseResponse projectAdd(
|
||||||
@RequestBody @Validated ProjectInfoVO projectInfoVO,
|
@RequestBody @Validated ProjectInfoVO projectInfoVO,
|
||||||
@NotNull BindingResult bindingResult) {
|
@NotNull BindingResult bindingResult,
|
||||||
log.info("请求接口[POST]: /project/add");
|
HttpServletRequest request
|
||||||
|
) {
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -239,7 +240,6 @@ public class ProjectController {
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("/project/delete")
|
@DeleteMapping("/project/delete")
|
||||||
public BaseResponse projectDelete(HttpServletRequest request, @RequestParam List<Long> id) {
|
public BaseResponse projectDelete(HttpServletRequest request, @RequestParam List<Long> id) {
|
||||||
log.info("请求接口[Delete]: /project/delete");
|
|
||||||
if (id == null) {
|
if (id == null) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
||||||
}
|
}
|
||||||
|
@ -248,7 +248,6 @@ public class ProjectController {
|
||||||
|
|
||||||
@GetMapping("/project/file")
|
@GetMapping("/project/file")
|
||||||
public BaseResponse getProjectFile(HttpServletRequest request, @RequestParam Long projectId) {
|
public BaseResponse getProjectFile(HttpServletRequest request, @RequestParam Long projectId) {
|
||||||
log.info("请求接口[Get]: /project/file");
|
|
||||||
//判断是否有参数错误
|
//判断是否有参数错误
|
||||||
if (projectId == null) {
|
if (projectId == null) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR);
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR);
|
||||||
|
|
|
@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletRequest;
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class ReviewController {
|
public class ReviewController {
|
||||||
|
|
||||||
// 审核服务
|
|
||||||
private final ReviewService reviewService;
|
private final ReviewService reviewService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -32,7 +31,6 @@ public class ReviewController {
|
||||||
**/
|
**/
|
||||||
@GetMapping("/review/getMyReview")
|
@GetMapping("/review/getMyReview")
|
||||||
public BaseResponse getUserReview(@RequestParam Long projectId, HttpServletRequest request) {
|
public BaseResponse getUserReview(@RequestParam Long projectId, HttpServletRequest request) {
|
||||||
log.info("请求接口[GET]: /review/getMyReview");
|
|
||||||
return reviewService.getUserReview(projectId, request);
|
return reviewService.getUserReview(projectId, request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,6 @@ public class RoleController {
|
||||||
*/
|
*/
|
||||||
@GetMapping("/role/get")
|
@GetMapping("/role/get")
|
||||||
public BaseResponse roleGet(HttpServletRequest request, @RequestParam(required = false) String id) {
|
public BaseResponse roleGet(HttpServletRequest request, @RequestParam(required = false) String id) {
|
||||||
log.info("请求接口[GET]: /role/get");
|
|
||||||
return roleService.roleGet(request, id);
|
return roleService.roleGet(request, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -63,7 +62,6 @@ public class RoleController {
|
||||||
@NotNull BindingResult bindingResult,
|
@NotNull BindingResult bindingResult,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[PUT]: /role/edit");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -82,7 +80,6 @@ public class RoleController {
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("/role/delete")
|
@DeleteMapping("/role/delete")
|
||||||
public BaseResponse roleDelete(HttpServletRequest request, @RequestParam Long id) {
|
public BaseResponse roleDelete(HttpServletRequest request, @RequestParam Long id) {
|
||||||
log.info("请求接口[DELETE]: /role/delete");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (id == null) {
|
if (id == null) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
||||||
|
@ -97,7 +94,6 @@ public class RoleController {
|
||||||
*/
|
*/
|
||||||
@PostMapping("role/user/add")
|
@PostMapping("role/user/add")
|
||||||
public BaseResponse roleAddUser(HttpServletRequest request, @RequestParam Long uid, @RequestParam Long rid) {
|
public BaseResponse roleAddUser(HttpServletRequest request, @RequestParam Long uid, @RequestParam Long rid) {
|
||||||
log.info("请求接口[POST]: /role/user/add");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (uid == null || rid == null) {
|
if (uid == null || rid == null) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
||||||
|
@ -112,7 +108,6 @@ public class RoleController {
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("role/user/remove")
|
@DeleteMapping("role/user/remove")
|
||||||
public BaseResponse roleRemoveUser(HttpServletRequest request, @RequestParam Long uid) {
|
public BaseResponse roleRemoveUser(HttpServletRequest request, @RequestParam Long uid) {
|
||||||
log.info("请求接口[POST]: /role/user/remove");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (uid == null) {
|
if (uid == null) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
||||||
|
@ -131,7 +126,6 @@ public class RoleController {
|
||||||
@NotNull BindingResult bindingResult,
|
@NotNull BindingResult bindingResult,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) throws ClassCopyException {
|
) throws ClassCopyException {
|
||||||
log.info("请求接口[POST]: /role/add");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -146,7 +140,6 @@ public class RoleController {
|
||||||
*/
|
*/
|
||||||
@PutMapping("role/user/change")
|
@PutMapping("role/user/change")
|
||||||
public BaseResponse roleChangeUser(HttpServletRequest request, @RequestParam Long uid, @RequestParam Long rid) {
|
public BaseResponse roleChangeUser(HttpServletRequest request, @RequestParam Long uid, @RequestParam Long rid) {
|
||||||
log.info("请求接口[POST]: /role/user/change");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (uid == null || rid == null) {
|
if (uid == null || rid == null) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
||||||
|
|
|
@ -33,7 +33,6 @@ public class TagController {
|
||||||
@RequestParam(required = false) String limit,
|
@RequestParam(required = false) String limit,
|
||||||
@RequestParam(required = false) String order
|
@RequestParam(required = false) String order
|
||||||
) {
|
) {
|
||||||
log.info("[Controller] 请求 getProjectList 接口");
|
|
||||||
// 处理默认数据
|
// 处理默认数据
|
||||||
if (page == null || !Pattern.matches("^[0-9]+$", page) || Integer.parseInt(page) < 1) {
|
if (page == null || !Pattern.matches("^[0-9]+$", page) || Integer.parseInt(page) < 1) {
|
||||||
page = "1";
|
page = "1";
|
||||||
|
|
|
@ -44,7 +44,6 @@ public class UserController {
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("/user/delete")
|
@DeleteMapping("/user/delete")
|
||||||
public BaseResponse userDelete(HttpServletRequest request, @RequestParam String id) {
|
public BaseResponse userDelete(HttpServletRequest request, @RequestParam String id) {
|
||||||
log.info("请求接口[PUT]: /user/delete");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (id == null) {
|
if (id == null) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
||||||
|
@ -61,7 +60,6 @@ public class UserController {
|
||||||
*/
|
*/
|
||||||
@PutMapping("/user/lock")
|
@PutMapping("/user/lock")
|
||||||
public BaseResponse userLock(HttpServletRequest request, @RequestParam Long id, @RequestParam Long isLock) {
|
public BaseResponse userLock(HttpServletRequest request, @RequestParam Long id, @RequestParam Long isLock) {
|
||||||
log.info("请求接口[PUT]: /user/lock");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (id == null) {
|
if (id == null) {
|
||||||
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
return ResultUtil.error(ErrorCode.PARAMETER_ERROR);
|
||||||
|
@ -81,7 +79,6 @@ public class UserController {
|
||||||
@RequestBody @Validated UserEditProfileVO userEditProfileVO,
|
@RequestBody @Validated UserEditProfileVO userEditProfileVO,
|
||||||
BindingResult bindingResult
|
BindingResult bindingResult
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[PUT]: /user/profile/edit");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -110,7 +107,6 @@ public class UserController {
|
||||||
@RequestParam @Nullable String phone,
|
@RequestParam @Nullable String phone,
|
||||||
@NotNull HttpServletRequest request
|
@NotNull HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[GET]: /user/current");
|
|
||||||
// 检查数据是否有问题
|
// 检查数据是否有问题
|
||||||
if (id != null && !id.isEmpty()) {
|
if (id != null && !id.isEmpty()) {
|
||||||
if (!Pattern.matches("^[0-9]+$", id)) {
|
if (!Pattern.matches("^[0-9]+$", id)) {
|
||||||
|
@ -153,7 +149,6 @@ public class UserController {
|
||||||
@NotNull BindingResult bindingResult,
|
@NotNull BindingResult bindingResult,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[POST]: /user/current/all");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -174,7 +169,6 @@ public class UserController {
|
||||||
BindingResult bindingResult,
|
BindingResult bindingResult,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[POST]: /user/add");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -194,7 +188,6 @@ public class UserController {
|
||||||
BindingResult bindingResult,
|
BindingResult bindingResult,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
log.info("请求接口[PUT]: /user/edit");
|
|
||||||
// 判断是否有参数错误
|
// 判断是否有参数错误
|
||||||
if (bindingResult.hasErrors()) {
|
if (bindingResult.hasErrors()) {
|
||||||
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR, Processing.getValidatedErrorList(bindingResult));
|
||||||
|
@ -205,7 +198,6 @@ public class UserController {
|
||||||
|
|
||||||
@GetMapping("/user/profile/get")
|
@GetMapping("/user/profile/get")
|
||||||
public BaseResponse userProfileGet(HttpServletRequest request) {
|
public BaseResponse userProfileGet(HttpServletRequest request) {
|
||||||
log.info("请求接口[GET]: /user/profile/get");
|
|
||||||
return userService.userProfileGet(request);
|
return userService.userProfileGet(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -35,8 +35,6 @@ public class InfoDAO {
|
||||||
* @return {@link CarouselDO}
|
* @return {@link CarouselDO}
|
||||||
*/
|
*/
|
||||||
public CarouselDO getCarousel() {
|
public CarouselDO getCarousel() {
|
||||||
log.info("\t> 执行 DAO 层 InfoDAO.getCarousel 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
String getCarouselSql = infoMapper.getCarousel();
|
String getCarouselSql = infoMapper.getCarousel();
|
||||||
CarouselDO getCarousel = null;
|
CarouselDO getCarousel = null;
|
||||||
if (getCarouselSql != null && !"{}".equals(getCarouselSql)) {
|
if (getCarouselSql != null && !"{}".equals(getCarouselSql)) {
|
||||||
|
@ -87,14 +85,12 @@ public class InfoDAO {
|
||||||
* @return {@link Boolean}
|
* @return {@link Boolean}
|
||||||
*/
|
*/
|
||||||
public boolean setCarousel(CarouselDO carouselDO) {
|
public boolean setCarousel(CarouselDO carouselDO) {
|
||||||
log.info("\t> 执行 DAO 层 InfoDAO.setCarousel 方法");
|
|
||||||
sortCarousel(carouselDO);
|
sortCarousel(carouselDO);
|
||||||
// 添加id
|
// 添加id
|
||||||
for (int i = 0; i < carouselDO.getData().size(); i++) {
|
for (int i = 0; i < carouselDO.getData().size(); i++) {
|
||||||
carouselDO.getData().get(i).setId(i + 1);
|
carouselDO.getData().get(i).setId(i + 1);
|
||||||
}
|
}
|
||||||
String setCarouselSql = gson.toJson(carouselDO);
|
String setCarouselSql = gson.toJson(carouselDO);
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return infoMapper.setCarousel(setCarouselSql);
|
return infoMapper.setCarousel(setCarouselSql);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,8 +15,6 @@ public class NewsDAO {
|
||||||
private final NewsMapper newsMapper;
|
private final NewsMapper newsMapper;
|
||||||
|
|
||||||
public void addNews(NewsDO newsVO, Long uid) {
|
public void addNews(NewsDO newsVO, Long uid) {
|
||||||
log.info("\t> 执行 DAO 层 NewsDAO.addNews 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
// 添加新闻数据
|
// 添加新闻数据
|
||||||
newsMapper.addNews(newsVO);
|
newsMapper.addNews(newsVO);
|
||||||
// 添加作者
|
// 添加作者
|
||||||
|
|
|
@ -40,29 +40,24 @@ public class PermissionDAO {
|
||||||
* @return {@link List<String>}
|
* @return {@link List<String>}
|
||||||
*/
|
*/
|
||||||
public List<String> getPermission(@NotNull Long uid) {
|
public List<String> getPermission(@NotNull Long uid) {
|
||||||
log.info("\t> 执行 DAO 层 PermissionDAO.getPermission 方法");
|
|
||||||
List<String> getPermissionForString;
|
List<String> getPermissionForString;
|
||||||
String permissionRedisString = roleRedisUtil.getData(BusinessConstants.NONE, uid.toString());
|
String permissionRedisString = roleRedisUtil.getData(BusinessConstants.NONE, uid.toString());
|
||||||
if (permissionRedisString == null) {
|
if (permissionRedisString == null) {
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
List<PermissionDO> permissionList = permissionMapper.permissionUserPid(uid);
|
List<PermissionDO> permissionList = permissionMapper.permissionUserPid(uid);
|
||||||
getPermissionForString = new ArrayList<>();
|
getPermissionForString = new ArrayList<>();
|
||||||
forPermissionToBuildString(permissionList, getPermissionForString);
|
forPermissionToBuildString(permissionList, getPermissionForString);
|
||||||
// 存入 Redis
|
// 存入 Redis
|
||||||
roleRedisUtil.setData(BusinessConstants.NONE, uid.toString(), gson.toJson(getPermissionForString), 1440);
|
roleRedisUtil.setData(BusinessConstants.NONE, uid.toString(), gson.toJson(getPermissionForString), 1440);
|
||||||
} else {
|
} else {
|
||||||
log.info("\t\t> 从 Redis 获取数据");
|
|
||||||
getPermissionForString = gson.fromJson(permissionRedisString, new TypeToken<List<String>>() { }.getType());
|
getPermissionForString = gson.fromJson(permissionRedisString, new TypeToken<List<String>>() { }.getType());
|
||||||
}
|
}
|
||||||
return getPermissionForString;
|
return getPermissionForString;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<String> getAllPermissionBuildString() {
|
public List<String> getAllPermissionBuildString() {
|
||||||
log.info("\t> 执行 DAO 层 PermissionDAO.getPermission 方法");
|
|
||||||
List<String> getPermissionForString;
|
List<String> getPermissionForString;
|
||||||
String getRedisData = roleRedisUtil.getData(BusinessConstants.ALL_PERMISSION, "string");
|
String getRedisData = roleRedisUtil.getData(BusinessConstants.ALL_PERMISSION, "string");
|
||||||
if (getRedisData == null) {
|
if (getRedisData == null) {
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
List<PermissionDO> permissionList = permissionMapper.getAllPermission();
|
List<PermissionDO> permissionList = permissionMapper.getAllPermission();
|
||||||
permissionList.removeIf(it -> it.getPid() != null);
|
permissionList.removeIf(it -> it.getPid() != null);
|
||||||
getPermissionForString = new ArrayList<>();
|
getPermissionForString = new ArrayList<>();
|
||||||
|
@ -74,17 +69,14 @@ public class PermissionDAO {
|
||||||
gson.toJson(getPermissionForString),
|
gson.toJson(getPermissionForString),
|
||||||
1440);
|
1440);
|
||||||
} else {
|
} else {
|
||||||
log.info("\t\t> 从 Redis 获取数据");
|
|
||||||
getPermissionForString = gson.fromJson(getRedisData, new TypeToken<List<String>>() { }.getType());
|
getPermissionForString = gson.fromJson(getRedisData, new TypeToken<List<String>>() { }.getType());
|
||||||
}
|
}
|
||||||
return getPermissionForString;
|
return getPermissionForString;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<PermissionDO> getRootPermission() {
|
public List<PermissionDO> getRootPermission() {
|
||||||
log.info("\t> 执行 DAO 层 PermissionDAO.getRootPermission 方法");
|
|
||||||
String getRedisData = roleRedisUtil.getData(BusinessConstants.ALL_PERMISSION, "all");
|
String getRedisData = roleRedisUtil.getData(BusinessConstants.ALL_PERMISSION, "all");
|
||||||
if (getRedisData == null) {
|
if (getRedisData == null) {
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
List<PermissionDO> permissionList = permissionMapper.getAllPermission();
|
List<PermissionDO> permissionList = permissionMapper.getAllPermission();
|
||||||
if (!permissionList.isEmpty()) {
|
if (!permissionList.isEmpty()) {
|
||||||
List<PermissionDO> getPermissionList = new ArrayList<>();
|
List<PermissionDO> getPermissionList = new ArrayList<>();
|
||||||
|
@ -99,7 +91,6 @@ public class PermissionDAO {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log.info("\t\t> 从 Redis 获取数据");
|
|
||||||
return gson.fromJson(getRedisData, new TypeToken<List<PermissionDO>>() {
|
return gson.fromJson(getRedisData, new TypeToken<List<PermissionDO>>() {
|
||||||
}.getType());
|
}.getType());
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,38 +28,27 @@ public class ProjectDAO {
|
||||||
private final Gson gson;
|
private final Gson gson;
|
||||||
|
|
||||||
public void projectAdd(ProjectInfoVO projectAdd) {
|
public void projectAdd(ProjectInfoVO projectAdd) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.projectAdd 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
|
|
||||||
projectMapper.projectAdd(projectAdd);
|
projectMapper.projectAdd(projectAdd);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void projectWorkAdd(ProjectWorkVO projectWorkVO) {
|
public void projectWorkAdd(ProjectWorkVO projectWorkVO) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.projectWorkAdd 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
projectMapper.projectWorkAdd(projectWorkVO);
|
projectMapper.projectWorkAdd(projectWorkVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ProjectDO projectEdit(@NotNull ProjectEditVO projectEdit, Long projectId) {
|
public ProjectDO projectEdit(@NotNull ProjectEditVO projectEdit, Long projectId) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.projectEdit 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 更新数据");
|
|
||||||
ProjectDO projectDO = new ProjectDO();
|
ProjectDO projectDO = new ProjectDO();
|
||||||
Processing.copyProperties(projectEdit, projectDO);
|
Processing.copyProperties(projectEdit, projectDO);
|
||||||
projectDO.setId(projectId);
|
projectDO.setId(projectId);
|
||||||
projectMapper.projectEdit(projectDO);
|
projectMapper.projectEdit(projectDO);
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return projectMapper.getProjectById(projectId);
|
return projectMapper.getProjectById(projectId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isExistProject(Long id) {
|
public boolean isExistProject(Long id) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.isExistProject 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return projectMapper.getProjectById(id) != null;
|
return projectMapper.getProjectById(id) != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ProjectShowDO getHeader() {
|
public ProjectShowDO getHeader() {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.getHeader 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
String getProjectShowSql = projectMapper.getHeader();
|
String getProjectShowSql = projectMapper.getHeader();
|
||||||
ProjectShowDO getProjectShow = null;
|
ProjectShowDO getProjectShow = null;
|
||||||
if (getProjectShowSql != null && !"{}".equals(getProjectShowSql)) {
|
if (getProjectShowSql != null && !"{}".equals(getProjectShowSql)) {
|
||||||
|
@ -71,7 +60,6 @@ public class ProjectDAO {
|
||||||
getProjectShow.setOrder("desc");
|
getProjectShow.setOrder("desc");
|
||||||
getProjectShow.setData(new ArrayList<>());
|
getProjectShow.setData(new ArrayList<>());
|
||||||
try {
|
try {
|
||||||
log.info("\t\t> 从 MySQL 插入数据");
|
|
||||||
projectMapper.insertProjectShow();
|
projectMapper.insertProjectShow();
|
||||||
} catch (DuplicateKeyException ignored) {
|
} catch (DuplicateKeyException ignored) {
|
||||||
}
|
}
|
||||||
|
@ -82,7 +70,6 @@ public class ProjectDAO {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sortProject(@NotNull ProjectShowDO projectShowDO) {
|
private void sortProject(@NotNull ProjectShowDO projectShowDO) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.sortProject 方法");
|
|
||||||
for (int i = 0; i < projectShowDO.getData().size(); i++) {
|
for (int i = 0; i < projectShowDO.getData().size(); i++) {
|
||||||
for (int j = 0; j < projectShowDO.getData().size(); j++) {
|
for (int j = 0; j < projectShowDO.getData().size(); j++) {
|
||||||
if ("desc".equals(projectShowDO.getOrder())) {
|
if ("desc".equals(projectShowDO.getOrder())) {
|
||||||
|
@ -101,30 +88,22 @@ public class ProjectDAO {
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean setProjectShow(ProjectShowDO projectShowDO) {
|
public boolean setProjectShow(ProjectShowDO projectShowDO) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.setProjectShow 方法");
|
|
||||||
sortProject(projectShowDO);
|
sortProject(projectShowDO);
|
||||||
String setProjectShow = gson.toJson(projectShowDO);
|
String setProjectShow = gson.toJson(projectShowDO);
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return projectMapper.setProjectShow(setProjectShow);
|
return projectMapper.setProjectShow(setProjectShow);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public ProjectDO getProjectById(Long id) {
|
public ProjectDO getProjectById(Long id) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.getProjectById 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return projectMapper.getProjectById(id);
|
return projectMapper.getProjectById(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ProjectDO> get(Long userId, List<String> tags, List<String> isFinish) {
|
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()) {
|
if (tags != null && !tags.isEmpty()) {
|
||||||
log.info("tags");
|
|
||||||
return projectMapper.getByTags(userId, tags, isFinish);
|
return projectMapper.getByTags(userId, tags, isFinish);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isFinish != null && !isFinish.isEmpty()) {
|
if (isFinish != null && !isFinish.isEmpty()) {
|
||||||
log.info("finish");
|
|
||||||
return projectMapper.getByIsfinish(userId, isFinish);
|
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) {
|
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()) {
|
if (tags != null && !tags.isEmpty()) {
|
||||||
return projectMapper.workgetByTags(userId, tags, is, isFinish);
|
return projectMapper.workgetByTags(userId, tags, is, isFinish);
|
||||||
}
|
}
|
||||||
|
@ -147,34 +124,25 @@ public class ProjectDAO {
|
||||||
}
|
}
|
||||||
|
|
||||||
public ProjectDO getByName(String name) {
|
public ProjectDO getByName(String name) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.getByName 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return projectMapper.getByName(name);
|
return projectMapper.getByName(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean projectDelete(Long id) {
|
public boolean projectDelete(Long id) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.projectDelete 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return projectMapper.deleteProject(id);
|
return projectMapper.deleteProject(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isExistProjectById(Long id) {
|
public boolean isExistProjectById(Long id) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.isExistProjectById 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return projectMapper.getProjectById(id) != null;
|
return projectMapper.getProjectById(id) != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public boolean isPrincipalUser(Long uid, Long projectId) {
|
public boolean isPrincipalUser(Long uid, Long projectId) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.isPrincipalUser 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
ProjectDO projectDO = projectMapper.getProjectById(projectId);
|
ProjectDO projectDO = projectMapper.getProjectById(projectId);
|
||||||
return Objects.equals(uid, projectDO.getPrincipalId());
|
return Objects.equals(uid, projectDO.getPrincipalId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public List<ProjectDO> tget(List<String> isFinish, List<String> tags) {
|
public List<ProjectDO> tget(List<String> isFinish, List<String> tags) {
|
||||||
log.info("DAO层tget");
|
|
||||||
|
|
||||||
if (tags != null && !tags.isEmpty()) {
|
if (tags != null && !tags.isEmpty()) {
|
||||||
return projectMapper.tgetBytags(tags, isFinish);
|
return projectMapper.tgetBytags(tags, isFinish);
|
||||||
|
@ -191,20 +159,14 @@ public class ProjectDAO {
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ProjectDO> getProjectByPrincipalUser(Long uid) {
|
public List<ProjectDO> getProjectByPrincipalUser(Long uid) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.getProjectFromUser 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return projectMapper.getProjectByPrincipalUser(uid);
|
return projectMapper.getProjectByPrincipalUser(uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ProjectModuleDO> getAllSubsystemByUserId(Long uid) {
|
public List<ProjectModuleDO> getAllSubsystemByUserId(Long uid) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.getAllSubsystemByUserId 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return projectMapper.getAllSubsystemByUserId(uid);
|
return projectMapper.getAllSubsystemByUserId(uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ProjectModuleDO> getAllSubmoduleByUserId(Long uid) {
|
public List<ProjectModuleDO> getAllSubmoduleByUserId(Long uid) {
|
||||||
log.info("\t> 执行 DAO 层 ProjectDAO.getAllSubmoduleByUserId 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return projectMapper.getAllSubmoduleByUserId(uid);
|
return projectMapper.getAllSubmoduleByUserId(uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,8 +23,6 @@ public class RoleDAO {
|
||||||
private final RoleRedisUtil<String> roleRedisUtil;
|
private final RoleRedisUtil<String> roleRedisUtil;
|
||||||
|
|
||||||
public void addRoleUser(Long uid, Long rid) {
|
public void addRoleUser(Long uid, Long rid) {
|
||||||
log.info("\t> 执行 DAO 层 RoleDAO.addRoleUser 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
roleMapper.roleAddUser(uid, rid);
|
roleMapper.roleAddUser(uid, rid);
|
||||||
roleRedisUtil.setData(
|
roleRedisUtil.setData(
|
||||||
BusinessConstants.USER,
|
BusinessConstants.USER,
|
||||||
|
@ -35,20 +33,15 @@ public class RoleDAO {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void delRoleUser(Long uid) {
|
public void delRoleUser(Long uid) {
|
||||||
log.info("\t> 执行 DAO 层 RoleDAO.delRoleUser 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
roleMapper.roleRemoveUser(uid);
|
roleMapper.roleRemoveUser(uid);
|
||||||
roleRedisUtil.delData(BusinessConstants.USER, uid.toString());
|
roleRedisUtil.delData(BusinessConstants.USER, uid.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
public RoleDO getRoleById(Long id) {
|
public RoleDO getRoleById(Long id) {
|
||||||
log.info("\t> 执行 DAO 层 RoleDAO.getRoleById 方法");
|
|
||||||
String getRedisData = roleRedisUtil.getData(BusinessConstants.NONE, "all");
|
String getRedisData = roleRedisUtil.getData(BusinessConstants.NONE, "all");
|
||||||
if (getRedisData == null) {
|
if (getRedisData == null) {
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return roleMapper.getRoleById(id);
|
return roleMapper.getRoleById(id);
|
||||||
} else {
|
} else {
|
||||||
log.info("\t\t> 从 Redis 获取数据");
|
|
||||||
List<RoleDO> roleList = gson.fromJson(getRedisData, new TypeToken<List<RoleDO>>() {
|
List<RoleDO> roleList = gson.fromJson(getRedisData, new TypeToken<List<RoleDO>>() {
|
||||||
}.getType());
|
}.getType());
|
||||||
for (RoleDO roleDO : roleList) {
|
for (RoleDO roleDO : roleList) {
|
||||||
|
@ -61,23 +54,18 @@ public class RoleDAO {
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<RoleDO> getRole() {
|
public List<RoleDO> getRole() {
|
||||||
log.info("\t> 执行 DAO 层 RoleDAO.getRole 方法");
|
|
||||||
String getRedisData = roleRedisUtil.getData(BusinessConstants.NONE, "all");
|
String getRedisData = roleRedisUtil.getData(BusinessConstants.NONE, "all");
|
||||||
if (getRedisData == null) {
|
if (getRedisData == null) {
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
List<RoleDO> roleList = roleMapper.getRole();
|
List<RoleDO> roleList = roleMapper.getRole();
|
||||||
roleRedisUtil.setData(BusinessConstants.NONE, "all", gson.toJson(roleList), 1440);
|
roleRedisUtil.setData(BusinessConstants.NONE, "all", gson.toJson(roleList), 1440);
|
||||||
return roleList;
|
return roleList;
|
||||||
} else {
|
} else {
|
||||||
log.info("\t\t> 从 Redis 获取数据");
|
|
||||||
return gson.fromJson(getRedisData, new TypeToken<List<RoleDO>>() {
|
return gson.fromJson(getRedisData, new TypeToken<List<RoleDO>>() {
|
||||||
}.getType());
|
}.getType());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void roleAdd(RoleDO roleDO) {
|
public void roleAdd(RoleDO roleDO) {
|
||||||
log.info("\t> 执行 DAO 层 RoleDAO.roleAdd 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
roleMapper.roleAdd(roleDO);
|
roleMapper.roleAdd(roleDO);
|
||||||
List<RoleDO> roleList = roleMapper.getRole();
|
List<RoleDO> roleList = roleMapper.getRole();
|
||||||
roleRedisUtil.setData(BusinessConstants.NONE, "all", gson.toJson(roleList), 120);
|
roleRedisUtil.setData(BusinessConstants.NONE, "all", gson.toJson(roleList), 120);
|
||||||
|
@ -85,15 +73,11 @@ public class RoleDAO {
|
||||||
}
|
}
|
||||||
|
|
||||||
public RoleDO getRoleNameByUid(Long uid) {
|
public RoleDO getRoleNameByUid(Long uid) {
|
||||||
log.info("\t> 执行 DAO 层 RoleDAO.getRoleNameByUid 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return roleMapper.getRoleById(getRoleUserByUid(uid).getRid());
|
return roleMapper.getRoleById(getRoleUserByUid(uid).getRid());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public boolean roleEdit(RoleDO getRole) {
|
public boolean roleEdit(RoleDO getRole) {
|
||||||
log.info("\t> 执行 DAO 层 RoleDAO.roleEdit 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
if (roleMapper.roleEdit(getRole)) {
|
if (roleMapper.roleEdit(getRole)) {
|
||||||
List<RoleDO> roleList = roleMapper.getRole();
|
List<RoleDO> roleList = roleMapper.getRole();
|
||||||
roleRedisUtil.setData(BusinessConstants.NONE, "all", gson.toJson(roleList), 1440);
|
roleRedisUtil.setData(BusinessConstants.NONE, "all", gson.toJson(roleList), 1440);
|
||||||
|
@ -104,8 +88,6 @@ public class RoleDAO {
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean roleDelete(Long id) {
|
public boolean roleDelete(Long id) {
|
||||||
log.info("\t> 执行 DAO 层 RoleDAO.roleDelete 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
if (roleMapper.roleDelete(id)) {
|
if (roleMapper.roleDelete(id)) {
|
||||||
List<RoleDO> roleList = roleMapper.getRole();
|
List<RoleDO> roleList = roleMapper.getRole();
|
||||||
roleRedisUtil.setData(BusinessConstants.NONE, "all", gson.toJson(roleList), 1440);
|
roleRedisUtil.setData(BusinessConstants.NONE, "all", gson.toJson(roleList), 1440);
|
||||||
|
@ -116,15 +98,11 @@ public class RoleDAO {
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isExistRoleByRoleName(String roleName) {
|
public boolean isExistRoleByRoleName(String roleName) {
|
||||||
log.info("\t> 执行 DAO 层 RoleDAO.isExistRoleByRoleName 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
RoleDO roleDO = roleMapper.getRoleByRoleName(roleName);
|
RoleDO roleDO = roleMapper.getRoleByRoleName(roleName);
|
||||||
return roleDO != null;
|
return roleDO != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean roleChangeUser(@NotNull Long uid, Long rid) {
|
public boolean roleChangeUser(@NotNull Long uid, Long rid) {
|
||||||
log.info("\t> 执行 DAO 层 RoleDAO.roleChangeUser 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
if (roleMapper.roleChangeUser(uid, rid)) {
|
if (roleMapper.roleChangeUser(uid, rid)) {
|
||||||
roleRedisUtil.setData(
|
roleRedisUtil.setData(
|
||||||
BusinessConstants.USER,
|
BusinessConstants.USER,
|
||||||
|
@ -139,13 +117,10 @@ public class RoleDAO {
|
||||||
}
|
}
|
||||||
|
|
||||||
public RoleUserDO getRoleUserByUid(@NotNull Long uid) {
|
public RoleUserDO getRoleUserByUid(@NotNull Long uid) {
|
||||||
log.info("\t> 执行 DAO 层 RoleDAO.getRoleUserByUid 方法");
|
|
||||||
String getRedisData = roleRedisUtil.getData(BusinessConstants.USER, uid.toString());
|
String getRedisData = roleRedisUtil.getData(BusinessConstants.USER, uid.toString());
|
||||||
if (getRedisData == null) {
|
if (getRedisData == null) {
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return roleMapper.getRoleUserByUid(uid);
|
return roleMapper.getRoleUserByUid(uid);
|
||||||
} else {
|
} else {
|
||||||
log.info("\t\t> 从 Redis 获取数据");
|
|
||||||
return gson.fromJson(getRedisData, RoleUserDO.class);
|
return gson.fromJson(getRedisData, RoleUserDO.class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,6 @@ public class TagDAO {
|
||||||
* @param order 排序
|
* @param order 排序
|
||||||
*/
|
*/
|
||||||
public ArrayList<TagProjectDO> getTagsProjectList(Integer page, Integer limit, String order) {
|
public ArrayList<TagProjectDO> getTagsProjectList(Integer page, Integer limit, String order) {
|
||||||
log.info("[DAO] 请求 getTagsProjectList 接口");
|
|
||||||
// 获取标签列表
|
// 获取标签列表
|
||||||
page = (page - 1) * limit;
|
page = (page - 1) * limit;
|
||||||
return (ArrayList<TagProjectDO>) tagMapper.getTagsProjectList(order, limit, page);
|
return (ArrayList<TagProjectDO>) tagMapper.getTagsProjectList(order, limit, page);
|
||||||
|
|
|
@ -50,7 +50,6 @@ public class UserDAO {
|
||||||
* @author 筱锋xiao_lfeng
|
* @author 筱锋xiao_lfeng
|
||||||
*/
|
*/
|
||||||
public UserDO getUserInfoByUsername(String username) {
|
public UserDO getUserInfoByUsername(String username) {
|
||||||
log.info("\t> 执行 DAO 层 UserDAO.getUserInfoByUsername 方法");
|
|
||||||
UserDO userDO = null;
|
UserDO userDO = null;
|
||||||
// 从 Redis 获取数据
|
// 从 Redis 获取数据
|
||||||
// TODO: 10000-Redis: 从 Redis 获取数据
|
// TODO: 10000-Redis: 从 Redis 获取数据
|
||||||
|
@ -70,15 +69,12 @@ public class UserDAO {
|
||||||
* @return Boolean
|
* @return Boolean
|
||||||
*/
|
*/
|
||||||
public Boolean isExistUser(@NotNull Long id) {
|
public Boolean isExistUser(@NotNull Long id) {
|
||||||
log.info("\t> 执行 DAO 层 UserDAO.isExistUser 方法");
|
|
||||||
// 从 Redis 获取数据
|
// 从 Redis 获取数据
|
||||||
String redisData = userRedisUtil.getData(BusinessConstants.NONE, id.toString());
|
String redisData = userRedisUtil.getData(BusinessConstants.NONE, id.toString());
|
||||||
if (redisData != null) {
|
if (redisData != null) {
|
||||||
log.info("\t\t> 从 Redis 获取数据");
|
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
UserDO userDO = userMapper.getUserById(id);
|
UserDO userDO = userMapper.getUserById(id);
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
if (userDO != null) {
|
if (userDO != null) {
|
||||||
userRedisUtil.setData(BusinessConstants.NONE, userDO.getId().toString(), gson.toJson(userDO), 120);
|
userRedisUtil.setData(BusinessConstants.NONE, userDO.getId().toString(), gson.toJson(userDO), 120);
|
||||||
return true;
|
return true;
|
||||||
|
@ -96,20 +92,15 @@ public class UserDAO {
|
||||||
* @param id 用户id
|
* @param id 用户id
|
||||||
*/
|
*/
|
||||||
public void userDelete(@NotNull Long id) {
|
public void userDelete(@NotNull Long id) {
|
||||||
log.info("\t> 执行 DAO 层 UserDAO.userDelete 方法");
|
|
||||||
// Redis 获取数据
|
// Redis 获取数据
|
||||||
String redisData = userRedisUtil.getData(BusinessConstants.NONE, id.toString());
|
String redisData = userRedisUtil.getData(BusinessConstants.NONE, id.toString());
|
||||||
if (redisData != null) {
|
if (redisData != null) {
|
||||||
log.info("\t\t> 从 Redis 删除数据");
|
|
||||||
userRedisUtil.delData(BusinessConstants.NONE, id.toString());
|
userRedisUtil.delData(BusinessConstants.NONE, id.toString());
|
||||||
}
|
}
|
||||||
log.info("\t\t> 从 MySQL 删除数据");
|
|
||||||
userMapper.userDelete(id);
|
userMapper.userDelete(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean userGetDelete(Long id) {
|
public boolean userGetDelete(Long id) {
|
||||||
log.info("\t> 执行 DAO 层 UserDAO.userGetDelete 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return userMapper.userGetDelete(id);
|
return userMapper.userGetDelete(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -119,20 +110,14 @@ public class UserDAO {
|
||||||
* @param id
|
* @param id
|
||||||
*/
|
*/
|
||||||
public void userLock(Long id, Long isLock) {
|
public void userLock(Long id, Long isLock) {
|
||||||
log.info("\t> 执行 DAO 层 UserDAO.userLock 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
userMapper.userLock(id, isLock);
|
userMapper.userLock(id, isLock);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void userEditProfile(UserEditProfileVO userEditProfileVO) {
|
public void userEditProfile(UserEditProfileVO userEditProfileVO) {
|
||||||
log.info("\t> 执行 DAO 层 UserDAO.userEditProfile 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
userMapper.userEditProfile(userEditProfileVO);
|
userMapper.userEditProfile(userEditProfileVO);
|
||||||
}
|
}
|
||||||
|
|
||||||
public UserCurrentBackVO userCurrentAll(UserAllCurrentVO userAllCurrentVO) {
|
public UserCurrentBackVO userCurrentAll(UserAllCurrentVO userAllCurrentVO) {
|
||||||
log.info("\t> 执行 DAO 层 UserDAO.userCurrentAll 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
List<UserDO> userCurrentDO = userMapper.getAllUser(userAllCurrentVO);
|
List<UserDO> userCurrentDO = userMapper.getAllUser(userAllCurrentVO);
|
||||||
UserCurrentBackVO userCurrentBackVO = new UserCurrentBackVO();
|
UserCurrentBackVO userCurrentBackVO = new UserCurrentBackVO();
|
||||||
userCurrentBackVO.setUsers(new ArrayList<>())
|
userCurrentBackVO.setUsers(new ArrayList<>())
|
||||||
|
@ -144,8 +129,6 @@ public class UserDAO {
|
||||||
}
|
}
|
||||||
|
|
||||||
public UserCurrentBackVO userCurrentAllLike(UserAllCurrentVO userAllCurrentVO) {
|
public UserCurrentBackVO userCurrentAllLike(UserAllCurrentVO userAllCurrentVO) {
|
||||||
log.info("\t> 执行 DAO 层 UserDAO.userCurrentAllLike 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
List<UserDO> userCurrentDO = userMapper.getAllUserBySearch(userAllCurrentVO);
|
List<UserDO> userCurrentDO = userMapper.getAllUserBySearch(userAllCurrentVO);
|
||||||
UserCurrentBackVO userCurrentBackVO = new UserCurrentBackVO();
|
UserCurrentBackVO userCurrentBackVO = new UserCurrentBackVO();
|
||||||
userCurrentBackVO.setUsers(new ArrayList<>())
|
userCurrentBackVO.setUsers(new ArrayList<>())
|
||||||
|
@ -163,14 +146,10 @@ public class UserDAO {
|
||||||
* @Param userDO: user 数据库表实体类
|
* @Param userDO: user 数据库表实体类
|
||||||
*/
|
*/
|
||||||
public boolean userAdd(UserDO userDO) {
|
public boolean userAdd(UserDO userDO) {
|
||||||
log.info("\t> 执行 DAO 层 userAdd 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return userMapper.insertUser(userDO);
|
return userMapper.insertUser(userDO);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void userEdit(UserDO userDO) {
|
public void userEdit(UserDO userDO) {
|
||||||
log.info("\t> 执行 DAO 层 userEdit 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
userMapper.updateUser(userDO);
|
userMapper.updateUser(userDO);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -181,8 +160,6 @@ public class UserDAO {
|
||||||
* @Param username: 用户名
|
* @Param username: 用户名
|
||||||
**/
|
**/
|
||||||
public Boolean isRepeatUser(String username) {
|
public Boolean isRepeatUser(String username) {
|
||||||
log.info("\t> 执行 DAO 层 isRepeatUser 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return userMapper.getUserInfoByUsername(username) != null;
|
return userMapper.getUserInfoByUsername(username) != null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -205,8 +182,6 @@ public class UserDAO {
|
||||||
* @Param userId
|
* @Param userId
|
||||||
**/
|
**/
|
||||||
public UserDO getUserById(Long userId) {
|
public UserDO getUserById(Long userId) {
|
||||||
log.info("\t> 执行 DAO 层 getUserById 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return userMapper.getUserById(userId);
|
return userMapper.getUserById(userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -217,8 +192,6 @@ public class UserDAO {
|
||||||
* @Param uid:用户id
|
* @Param uid:用户id
|
||||||
**/
|
**/
|
||||||
public RoleUserDO getRoleFromUser(Long uid) {
|
public RoleUserDO getRoleFromUser(Long uid) {
|
||||||
log.info("\t> 执行 DAO 层 getRoleFromUser 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return userMapper.getRoleIdByUserId(uid);
|
return userMapper.getRoleIdByUserId(uid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -229,8 +202,6 @@ public class UserDAO {
|
||||||
* @Param null:用户id
|
* @Param null:用户id
|
||||||
**/
|
**/
|
||||||
public Boolean isManagerByRoleId(Long roleId) {
|
public Boolean isManagerByRoleId(Long roleId) {
|
||||||
log.info("\t> 执行 DAO 层 isManagerByRoleId 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
RoleDO role = userMapper.getRoleById(roleId);
|
RoleDO role = userMapper.getRoleById(roleId);
|
||||||
if (role == null) {
|
if (role == null) {
|
||||||
return false;
|
return false;
|
||||||
|
@ -240,26 +211,18 @@ public class UserDAO {
|
||||||
|
|
||||||
|
|
||||||
public List<UserDO> getRecommendUser() {
|
public List<UserDO> getRecommendUser() {
|
||||||
log.info("\t> 执行 DAO 层 getRecommendUser 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return userMapper.getRecommendUser();
|
return userMapper.getRecommendUser();
|
||||||
}
|
}
|
||||||
|
|
||||||
public UserDO getUserByEmail(String email) {
|
public UserDO getUserByEmail(String email) {
|
||||||
log.info("\t> 执行 DAO 层 getUserByEmail 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return userMapper.getUserByEmail(email);
|
return userMapper.getUserByEmail(email);
|
||||||
}
|
}
|
||||||
|
|
||||||
public UserDO getUserByPhone(String phone) {
|
public UserDO getUserByPhone(String phone) {
|
||||||
log.info("\t> 执行 DAO 层 getUserByPhone 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return userMapper.getUserByPhone(phone);
|
return userMapper.getUserByPhone(phone);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long getUsersCount() {
|
public Long getUsersCount() {
|
||||||
log.info("\t> 执行 DAO 层 getUsersCount 方法");
|
|
||||||
log.info("\t\t> 从 MySQL 获取数据");
|
|
||||||
return userMapper.getUsersCount();
|
return userMapper.getUsersCount();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,6 @@ public class AuthServiceImpl implements AuthService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse authRegister(@NotNull UserRegisterVO userRegisterVO) {
|
public BaseResponse authRegister(@NotNull UserRegisterVO userRegisterVO) {
|
||||||
log.info("\t> 执行 Service 层 AuthService.authRegister 方法");
|
|
||||||
// 检查用户说是否存在
|
// 检查用户说是否存在
|
||||||
UserDO getUserByUsername = userMapper.getUserInfoByUsername(userRegisterVO.getUsername());
|
UserDO getUserByUsername = userMapper.getUserInfoByUsername(userRegisterVO.getUsername());
|
||||||
// 用户名已存在
|
// 用户名已存在
|
||||||
|
@ -86,7 +85,6 @@ public class AuthServiceImpl implements AuthService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse authLogin(@NotNull UserLoginVO userLoginVO) {
|
public BaseResponse authLogin(@NotNull UserLoginVO userLoginVO) {
|
||||||
log.info("\t> 执行 Service 层 AuthService.userLogin 方法");
|
|
||||||
// 检查用户是否存在
|
// 检查用户是否存在
|
||||||
UserDO userDO;
|
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}$",
|
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
|
@Override
|
||||||
public BaseResponse authLoginByEmail(String email, Integer code) {
|
public BaseResponse authLoginByEmail(String email, Integer code) {
|
||||||
log.info("\t> 执行 Service 层 AuthService.authLoginByEmail 方法");
|
|
||||||
// 获取验证码是否有效
|
// 获取验证码是否有效
|
||||||
Integer redisCode = emailRedisUtil.getData(BusinessConstants.BUSINESS_LOGIN, email);
|
Integer redisCode = emailRedisUtil.getData(BusinessConstants.BUSINESS_LOGIN, email);
|
||||||
if (redisCode != null) {
|
if (redisCode != null) {
|
||||||
|
@ -151,7 +148,6 @@ public class AuthServiceImpl implements AuthService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse authLoginSendEmailCode(String email) {
|
public BaseResponse authLoginSendEmailCode(String email) {
|
||||||
log.info("\t> 执行 Service 层 AuthService.authLoginSendEmailCode 方法");
|
|
||||||
// 获取用户信息
|
// 获取用户信息
|
||||||
UserDO userDO = userMapper.getUserInfoByEmail(email);
|
UserDO userDO = userMapper.getUserInfoByEmail(email);
|
||||||
if (userDO != null) {
|
if (userDO != null) {
|
||||||
|
@ -181,7 +177,6 @@ public class AuthServiceImpl implements AuthService {
|
||||||
@NotNull UserChangePasswordVO userChangePasswordVO,
|
@NotNull UserChangePasswordVO userChangePasswordVO,
|
||||||
HttpServletRequest request
|
HttpServletRequest request
|
||||||
) {
|
) {
|
||||||
log.info("\t> 执行 Service 层 AuthService.authChangePassword 方法");
|
|
||||||
// 检查新密码输入无误
|
// 检查新密码输入无误
|
||||||
if (!userChangePasswordVO.getNewPassword().equals(userChangePasswordVO.getConfirmPassword())) {
|
if (!userChangePasswordVO.getNewPassword().equals(userChangePasswordVO.getConfirmPassword())) {
|
||||||
return ResultUtil.error(ErrorCode.PASSWORD_NOT_SAME);
|
return ResultUtil.error(ErrorCode.PASSWORD_NOT_SAME);
|
||||||
|
@ -212,7 +207,6 @@ public class AuthServiceImpl implements AuthService {
|
||||||
@Override
|
@Override
|
||||||
@UserAbleToUse
|
@UserAbleToUse
|
||||||
public BaseResponse authLogout(HttpServletRequest request) {
|
public BaseResponse authLogout(HttpServletRequest request) {
|
||||||
log.info("\t> 执行 Service 层 AuthService.authLogout 方法");
|
|
||||||
// 获取用户
|
// 获取用户
|
||||||
UserDO userDO = userMapper.getUserById(Processing.getAuthHeaderToUserId(request));
|
UserDO userDO = userMapper.getUserById(Processing.getAuthHeaderToUserId(request));
|
||||||
// 删除Token
|
// 删除Token
|
||||||
|
@ -225,7 +219,6 @@ public class AuthServiceImpl implements AuthService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse authForgetPassword(@NotNull UserForgetPasswordVO userForgetPasswordVO) {
|
public BaseResponse authForgetPassword(@NotNull UserForgetPasswordVO userForgetPasswordVO) {
|
||||||
log.info("\t> 执行 Service 层 AuthService.authForgetPassword 方法");
|
|
||||||
// 获取验证码是否有效
|
// 获取验证码是否有效
|
||||||
Integer redisCode = emailRedisUtil.getData(BusinessConstants.BUSINESS_LOGIN, userForgetPasswordVO.getEmail());
|
Integer redisCode = emailRedisUtil.getData(BusinessConstants.BUSINESS_LOGIN, userForgetPasswordVO.getEmail());
|
||||||
if (redisCode != null) {
|
if (redisCode != null) {
|
||||||
|
|
|
@ -43,7 +43,6 @@ public class InfoServiceImpl implements InfoService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("info.image.add")
|
@NeedRoleGroup("info.image.add")
|
||||||
public BaseResponse addHeaderImage(HttpServletRequest request, @NotNull CarouselVO carouselVO) {
|
public BaseResponse addHeaderImage(HttpServletRequest request, @NotNull CarouselVO carouselVO) {
|
||||||
log.info("\t> 执行 Service 层 InfoService.addHeaderImage 方法");
|
|
||||||
// 获取用户
|
// 获取用户
|
||||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||||
UserDO userDO = userDAO.getUserById(userId);
|
UserDO userDO = userDAO.getUserById(userId);
|
||||||
|
@ -77,7 +76,6 @@ public class InfoServiceImpl implements InfoService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("info.image.edit")
|
@NeedRoleGroup("info.image.edit")
|
||||||
public BaseResponse editHeaderImage(HttpServletRequest request, @NotNull CarouselVO carouselVO) {
|
public BaseResponse editHeaderImage(HttpServletRequest request, @NotNull CarouselVO carouselVO) {
|
||||||
log.info("\t> 执行 Service 层 InfoService.editHeaderImage 方法");
|
|
||||||
// 获取用户
|
// 获取用户
|
||||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||||
UserDO userDO = userDAO.getUserById(userId);
|
UserDO userDO = userDAO.getUserById(userId);
|
||||||
|
@ -112,7 +110,6 @@ public class InfoServiceImpl implements InfoService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse getHeaderImage(Integer id) {
|
public BaseResponse getHeaderImage(Integer id) {
|
||||||
log.info("\t> 执行 Service 层 InfoService.getHeaderImage 方法");
|
|
||||||
// 获取轮播图信息
|
// 获取轮播图信息
|
||||||
CarouselDO carouselDO = infoDAO.getCarousel();
|
CarouselDO carouselDO = infoDAO.getCarousel();
|
||||||
if (id != null) {
|
if (id != null) {
|
||||||
|
@ -129,7 +126,6 @@ public class InfoServiceImpl implements InfoService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("info.image.del")
|
@NeedRoleGroup("info.image.del")
|
||||||
public BaseResponse delHeaderImage(HttpServletRequest request, Integer id) {
|
public BaseResponse delHeaderImage(HttpServletRequest request, Integer id) {
|
||||||
log.info("\t> 执行 Service 层 InfoService.delHeaderImage 方法");
|
|
||||||
// 用户权限校验
|
// 用户权限校验
|
||||||
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
||||||
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
||||||
|
@ -152,7 +148,6 @@ public class InfoServiceImpl implements InfoService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("info.image.setting.edit")
|
@NeedRoleGroup("info.image.setting.edit")
|
||||||
public BaseResponse editSettingHeaderImage(HttpServletRequest request, Boolean showType) {
|
public BaseResponse editSettingHeaderImage(HttpServletRequest request, Boolean showType) {
|
||||||
log.info("\t> 执行 Service 层 InfoService.editSettingHeaderImage 方法");
|
|
||||||
// 用户权限校验
|
// 用户权限校验
|
||||||
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
||||||
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
||||||
|
@ -170,7 +165,6 @@ public class InfoServiceImpl implements InfoService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse getHeaderUser(HttpServletRequest request, String order, String orderBy) {
|
public BaseResponse getHeaderUser(HttpServletRequest request, String order, String orderBy) {
|
||||||
log.info("\t> 执行 Service 层 InfoService.getHeaderUser 方法");
|
|
||||||
// 默认无参数情况
|
// 默认无参数情况
|
||||||
if (order == null) {
|
if (order == null) {
|
||||||
order = "asc";
|
order = "asc";
|
||||||
|
|
|
@ -41,7 +41,6 @@ public class MailServiceImpl implements MailService {
|
||||||
@Async
|
@Async
|
||||||
@UserAbleToUse
|
@UserAbleToUse
|
||||||
public void sendMail(String sendTo, String subject, String text) {
|
public void sendMail(String sendTo, String subject, String text) {
|
||||||
log.info("\t> 执行 Service 层 MailService.sendMail 方法");
|
|
||||||
//发送多媒体邮件
|
//发送多媒体邮件
|
||||||
try {
|
try {
|
||||||
MimeMessage message = javaMailSender.createMimeMessage();
|
MimeMessage message = javaMailSender.createMimeMessage();
|
||||||
|
@ -64,15 +63,12 @@ public class MailServiceImpl implements MailService {
|
||||||
@Override
|
@Override
|
||||||
@Async
|
@Async
|
||||||
@UserAbleToUse
|
@UserAbleToUse
|
||||||
public void sendMail(String sendTo, String model) {
|
public void sendMail(String sendTo, String model) { }
|
||||||
log.info("\t> 执行 Service 层 MailService.sendMail 方法");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Async
|
@Async
|
||||||
@UserAbleToUse
|
@UserAbleToUse
|
||||||
public void sendMailAboutUserLogin(String email, Integer code) {
|
public void sendMailAboutUserLogin(String email, Integer code) {
|
||||||
log.info("\t> 执行 Service 层 MailService.sendMailAboutUserLogin 方法");
|
|
||||||
// 发送邮件带HTML模块部分
|
// 发送邮件带HTML模块部分
|
||||||
try {
|
try {
|
||||||
MimeMessage message = javaMailSender.createMimeMessage();
|
MimeMessage message = javaMailSender.createMimeMessage();
|
||||||
|
|
|
@ -30,7 +30,6 @@ public class ModuleServiceImpl implements ModuleService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse getByProjectId(Integer projectId, HttpServletRequest request) {
|
public BaseResponse getByProjectId(Integer projectId, HttpServletRequest request) {
|
||||||
log.info("projectService");
|
|
||||||
//获取用户id
|
//获取用户id
|
||||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||||
//获取项目负责人id
|
//获取项目负责人id
|
||||||
|
@ -48,7 +47,6 @@ public class ModuleServiceImpl implements ModuleService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse getBySysId(Integer sysId, HttpServletRequest request) {
|
public BaseResponse getBySysId(Integer sysId, HttpServletRequest request) {
|
||||||
log.info("SysService");
|
|
||||||
//获取用户id
|
//获取用户id
|
||||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||||
//获取子系统负责人id
|
//获取子系统负责人id
|
||||||
|
|
|
@ -37,7 +37,6 @@ public class NewsServiceImpl implements NewsService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("news.add")
|
@NeedRoleGroup("news.add")
|
||||||
public BaseResponse newsAdd(NewsAddVO newsAddVO, @NotNull HttpServletRequest request) {
|
public BaseResponse newsAdd(NewsAddVO newsAddVO, @NotNull HttpServletRequest request) {
|
||||||
log.info("\t> 执行 Service 层 NewsService.newsAdd 方法");
|
|
||||||
// 拷贝新闻数据到实体类
|
// 拷贝新闻数据到实体类
|
||||||
NewsDO newsDO = new NewsDO();
|
NewsDO newsDO = new NewsDO();
|
||||||
Processing.copyProperties(newsAddVO, newsDO);
|
Processing.copyProperties(newsAddVO, newsDO);
|
||||||
|
|
|
@ -43,7 +43,6 @@ public class PermissionServiceImpl implements PermissionService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("permission.add")
|
@NeedRoleGroup("permission.add")
|
||||||
public BaseResponse permissionAdd(HttpServletRequest request, Long rid, Long pid) {
|
public BaseResponse permissionAdd(HttpServletRequest request, Long rid, Long pid) {
|
||||||
log.info("\t> 执行 Service 层 PermissionService.permissionAdd 方法");
|
|
||||||
permissionMapper.permissionAdd(rid, pid);
|
permissionMapper.permissionAdd(rid, pid);
|
||||||
return ResultUtil.success();
|
return ResultUtil.success();
|
||||||
}
|
}
|
||||||
|
@ -51,7 +50,6 @@ public class PermissionServiceImpl implements PermissionService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("permission.user")
|
@NeedRoleGroup("permission.user")
|
||||||
public BaseResponse permissionUser(HttpServletRequest request, Long uid) {
|
public BaseResponse permissionUser(HttpServletRequest request, Long uid) {
|
||||||
log.info("\t> 执行 Service 层 PermissionService.permissionUserPid 方法");
|
|
||||||
if (userDAO.isExistUser(uid)) {
|
if (userDAO.isExistUser(uid)) {
|
||||||
// 此用户是否为管理员
|
// 此用户是否为管理员
|
||||||
RoleUserDO roleUserDO = roleDAO.getRoleUserByUid(uid);
|
RoleUserDO roleUserDO = roleDAO.getRoleUserByUid(uid);
|
||||||
|
@ -72,7 +70,6 @@ public class PermissionServiceImpl implements PermissionService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("permission.get")
|
@NeedRoleGroup("permission.get")
|
||||||
public BaseResponse permissionGet(HttpServletRequest request) {
|
public BaseResponse permissionGet(HttpServletRequest request) {
|
||||||
log.info("\t> 执行 Service 层 PermissionService.permissionGet 方法");
|
|
||||||
//获取所有权限数据
|
//获取所有权限数据
|
||||||
List<PermissionDO> permissionDOList = permissionMapper.getAllPermission();
|
List<PermissionDO> permissionDOList = permissionMapper.getAllPermission();
|
||||||
//将数据按父子类封装
|
//将数据按父子类封装
|
||||||
|
@ -84,7 +81,6 @@ public class PermissionServiceImpl implements PermissionService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("permission.edit")
|
@NeedRoleGroup("permission.edit")
|
||||||
public BaseResponse permissionEdit(PermissionEditVO permissionEditVo, HttpServletRequest request) {
|
public BaseResponse permissionEdit(PermissionEditVO permissionEditVo, HttpServletRequest request) {
|
||||||
log.info("\t> 执行 Service 层 PermissionService.permissionEdit 方法");
|
|
||||||
//根据id获取对应permission数据
|
//根据id获取对应permission数据
|
||||||
PermissionDO permissionDO = permissionMapper.getPermissionById(permissionEditVo.getId());
|
PermissionDO permissionDO = permissionMapper.getPermissionById(permissionEditVo.getId());
|
||||||
if (permissionDO == null) {
|
if (permissionDO == null) {
|
||||||
|
@ -102,7 +98,6 @@ public class PermissionServiceImpl implements PermissionService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("permission.delete")
|
@NeedRoleGroup("permission.delete")
|
||||||
public BaseResponse permissionDelete(HttpServletRequest request, Long pid) {
|
public BaseResponse permissionDelete(HttpServletRequest request, Long pid) {
|
||||||
log.info("\t> 执行 Service 层 PermissionService.permissionDelete 方法");
|
|
||||||
//删除权限
|
//删除权限
|
||||||
if (!permissionMapper.deletePermission(pid)) {
|
if (!permissionMapper.deletePermission(pid)) {
|
||||||
return ResultUtil.error(ErrorCode.DATABASE_DELETE_ERROR);
|
return ResultUtil.error(ErrorCode.DATABASE_DELETE_ERROR);
|
||||||
|
|
|
@ -54,7 +54,6 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd) {
|
public BaseResponse projectAdd(HttpServletRequest request, ProjectInfoVO projectAdd) {
|
||||||
log.info("\t> 执行 Service 层 ProjectService.projectAdd 方法");
|
|
||||||
if (projectAdd.getDescription().isEmpty()) {
|
if (projectAdd.getDescription().isEmpty()) {
|
||||||
projectAdd.setDescription("{}");
|
projectAdd.setDescription("{}");
|
||||||
} else {
|
} else {
|
||||||
|
@ -81,7 +80,6 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse projectWorkAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO) {
|
public BaseResponse projectWorkAdd(HttpServletRequest request, ProjectWorkVO projectWorkVO) {
|
||||||
log.info("\t> 执行 Service 层 ProjectService.projectWorkAdd 方法");
|
|
||||||
//获取用户id
|
//获取用户id
|
||||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||||
//是否是增加子系统
|
//是否是增加子系统
|
||||||
|
@ -106,7 +104,6 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse tGet(List<String> tags, List<String> isFinish, Integer page, Integer pageSize) {
|
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);
|
List<ProjectDO> projectDOList = projectDAO.tget(isFinish, tags);
|
||||||
|
|
||||||
|
@ -201,7 +198,6 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse projectEdit(HttpServletRequest request, @NotNull ProjectEditVO projectEdit, Long projectId) {
|
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
|
@Override
|
||||||
@NeedRoleGroup("info.project.add")
|
@NeedRoleGroup("info.project.add")
|
||||||
public BaseResponse addHeader(HttpServletRequest request, ProjectShowVO projectShowVO) {
|
public BaseResponse addHeader(HttpServletRequest request, ProjectShowVO projectShowVO) {
|
||||||
log.info("\t> 执行 Service 层 InfoService.addHeader 方法");
|
|
||||||
// 获取用户
|
// 获取用户
|
||||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||||
UserDO userDO = userDAO.getUserById(userId);
|
UserDO userDO = userDAO.getUserById(userId);
|
||||||
|
@ -265,7 +260,6 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("info.project.del")
|
@NeedRoleGroup("info.project.del")
|
||||||
public BaseResponse delHeader(Integer id, HttpServletRequest request) {
|
public BaseResponse delHeader(Integer id, HttpServletRequest request) {
|
||||||
log.info("\t> 执行 Service 层 InfoService.delHeader 方法");
|
|
||||||
// 获取展示信息
|
// 获取展示信息
|
||||||
ProjectShowDO projectShowDO = projectDAO.getHeader();
|
ProjectShowDO projectShowDO = projectDAO.getHeader();
|
||||||
// 删除指定展示id
|
// 删除指定展示id
|
||||||
|
@ -284,7 +278,6 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("info.project.edit")
|
@NeedRoleGroup("info.project.edit")
|
||||||
public BaseResponse editHeader(HttpServletRequest request, ProjectShowVO projectShowVO, Integer id) {
|
public BaseResponse editHeader(HttpServletRequest request, ProjectShowVO projectShowVO, Integer id) {
|
||||||
log.info("\t> 执行 Service 层 InfoService.editHeader 方法");
|
|
||||||
// 获取用户
|
// 获取用户
|
||||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||||
UserDO userDO = userDAO.getUserById(userId);
|
UserDO userDO = userDAO.getUserById(userId);
|
||||||
|
@ -319,7 +312,6 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
Integer page,
|
Integer page,
|
||||||
Integer pageSize
|
Integer pageSize
|
||||||
) {
|
) {
|
||||||
log.info("\t> 执行 Service 层 ProjectService.workGet 方法");
|
|
||||||
//获取用户
|
//获取用户
|
||||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||||
|
|
||||||
|
@ -342,7 +334,6 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse getByName(String name) {
|
public BaseResponse getByName(String name) {
|
||||||
log.info("\t> 执行 Service 层 ProjectService.getByName 方法");
|
|
||||||
if (projectDAO.getByName(name) == null) {
|
if (projectDAO.getByName(name) == null) {
|
||||||
return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST);
|
return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST);
|
||||||
} else {
|
} else {
|
||||||
|
@ -352,7 +343,6 @@ public class ProjectServiceImpl implements ProjectService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse projectDelete(HttpServletRequest request, List<Long> id) {
|
public BaseResponse projectDelete(HttpServletRequest request, List<Long> id) {
|
||||||
log.info("\t> 执行 Service 层 ProjectService.projectDelete 方法");
|
|
||||||
|
|
||||||
//判断用户是否为老师 或者 项目负责人
|
//判断用户是否为老师 或者 项目负责人
|
||||||
if (!Processing.checkUserIsTeacher(request, roleDAO)) {
|
if (!Processing.checkUserIsTeacher(request, roleDAO)) {
|
||||||
|
|
|
@ -37,8 +37,6 @@ public class ReviewServiceImpl implements ReviewService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse getUserReview(Long projectId, HttpServletRequest request) {
|
public BaseResponse getUserReview(Long projectId, HttpServletRequest request) {
|
||||||
log.info("\t> 执行 Service 层 ReviewService.getUserReview 方法");
|
|
||||||
|
|
||||||
//获取用户
|
//获取用户
|
||||||
Long userId = Processing.getAuthHeaderToUserId(request);
|
Long userId = Processing.getAuthHeaderToUserId(request);
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,6 @@ public class RoleServiceImpl implements RoleService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("role.add")
|
@NeedRoleGroup("role.add")
|
||||||
public BaseResponse roleAddUser(HttpServletRequest request, Long uid, Long rid) {
|
public BaseResponse roleAddUser(HttpServletRequest request, Long uid, Long rid) {
|
||||||
log.info("\t> 执行 Service 层 RoleService.addRoleUser 方法");
|
|
||||||
if (Processing.checkUserIsAdmin(request, roleDAO)) {
|
if (Processing.checkUserIsAdmin(request, roleDAO)) {
|
||||||
roleDAO.addRoleUser(uid, rid);
|
roleDAO.addRoleUser(uid, rid);
|
||||||
return ResultUtil.success();
|
return ResultUtil.success();
|
||||||
|
@ -56,7 +55,6 @@ public class RoleServiceImpl implements RoleService {
|
||||||
@Override
|
@Override
|
||||||
|
|
||||||
public BaseResponse roleRemoveUser(HttpServletRequest request, Long uid) {
|
public BaseResponse roleRemoveUser(HttpServletRequest request, Long uid) {
|
||||||
log.info("\t> 执行 Service 层 RoleService.delRoleUser 方法");
|
|
||||||
if (Processing.checkUserIsAdmin(request, roleDAO)) {
|
if (Processing.checkUserIsAdmin(request, roleDAO)) {
|
||||||
roleDAO.delRoleUser(uid);
|
roleDAO.delRoleUser(uid);
|
||||||
return ResultUtil.success();
|
return ResultUtil.success();
|
||||||
|
@ -67,7 +65,6 @@ public class RoleServiceImpl implements RoleService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse roleChangeUser(HttpServletRequest request, Long uid, Long rid) {
|
public BaseResponse roleChangeUser(HttpServletRequest request, Long uid, Long rid) {
|
||||||
log.info("\t> 执行 Service 层 RoleService.roleChangeUser 方法");
|
|
||||||
//检测用户是否存在
|
//检测用户是否存在
|
||||||
if (!userDAO.isExistUser(uid)) {
|
if (!userDAO.isExistUser(uid)) {
|
||||||
return ResultUtil.error(ErrorCode.USER_NOT_EXIST);
|
return ResultUtil.error(ErrorCode.USER_NOT_EXIST);
|
||||||
|
@ -90,7 +87,6 @@ public class RoleServiceImpl implements RoleService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse roleGet(HttpServletRequest request, String id) {
|
public BaseResponse roleGet(HttpServletRequest request, String id) {
|
||||||
log.info("\t> 执行 Service 层 RoleService.roleGet 方法");
|
|
||||||
// 检查用户权限
|
// 检查用户权限
|
||||||
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
||||||
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
||||||
|
@ -117,7 +113,6 @@ public class RoleServiceImpl implements RoleService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse roleEdit(HttpServletRequest request, RoleEditVO roleEditVO) {
|
public BaseResponse roleEdit(HttpServletRequest request, RoleEditVO roleEditVO) {
|
||||||
log.info("\t> 执行 Service 层 RoleService.roleEdit 方法");
|
|
||||||
// 检查用户权限
|
// 检查用户权限
|
||||||
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
||||||
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
||||||
|
@ -141,7 +136,6 @@ public class RoleServiceImpl implements RoleService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse roleDelete(HttpServletRequest request, Long id) {
|
public BaseResponse roleDelete(HttpServletRequest request, Long id) {
|
||||||
log.info("\t> 执行 Service 层 RoleService.roleDelete 方法");
|
|
||||||
// 检查用户权限
|
// 检查用户权限
|
||||||
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
||||||
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
||||||
|
@ -163,7 +157,6 @@ public class RoleServiceImpl implements RoleService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse addRole(HttpServletRequest request, RoleAddVo roleAddVO) throws ClassCopyException {
|
public BaseResponse addRole(HttpServletRequest request, RoleAddVo roleAddVO) throws ClassCopyException {
|
||||||
log.info("\t> 执行 Service 层 RoleService.addRole 方法");
|
|
||||||
// 检查用户权限
|
// 检查用户权限
|
||||||
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
||||||
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
||||||
|
|
|
@ -37,7 +37,6 @@ public class TagServiceImpl implements TagService {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse getTagsProjectList(Integer page, Integer limit, String order) {
|
public BaseResponse getTagsProjectList(Integer page, Integer limit, String order) {
|
||||||
log.info("[Service] 请求 getTagsProjectList 接口");
|
|
||||||
// 获取标签列表
|
// 获取标签列表
|
||||||
ArrayList<TagProjectDO> getTagList = tagDAO.getTagsProjectList(page, limit, order);
|
ArrayList<TagProjectDO> getTagList = tagDAO.getTagsProjectList(page, limit, order);
|
||||||
return ResultUtil.success(getTagList);
|
return ResultUtil.success(getTagList);
|
||||||
|
|
|
@ -52,7 +52,6 @@ public class UserServiceImpl implements UserService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse userDelete(HttpServletRequest request, Long id) {
|
public BaseResponse userDelete(HttpServletRequest request, Long id) {
|
||||||
log.info("\t> 执行 Service 层 UserService.userDelete 方法");
|
|
||||||
//判断用户是否存在
|
//判断用户是否存在
|
||||||
if (userDAO.isExistUser(id)) {
|
if (userDAO.isExistUser(id)) {
|
||||||
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
||||||
|
@ -72,7 +71,6 @@ public class UserServiceImpl implements UserService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse userLock(HttpServletRequest request, Long id, Long isLock) {
|
public BaseResponse userLock(HttpServletRequest request, Long id, Long isLock) {
|
||||||
log.info("\t> 执行 Service 层 UserService.userLock 方法");
|
|
||||||
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
||||||
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
||||||
}
|
}
|
||||||
|
@ -87,7 +85,6 @@ public class UserServiceImpl implements UserService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse userEditProfile(@NotNull UserEditProfileVO userEditProfileVO) {
|
public BaseResponse userEditProfile(@NotNull UserEditProfileVO userEditProfileVO) {
|
||||||
log.info("\t> 执行 Service 层 UserService.userEditProfile 方法");
|
|
||||||
if (userDAO.isExistUser(userEditProfileVO.getId())) {
|
if (userDAO.isExistUser(userEditProfileVO.getId())) {
|
||||||
userDAO.userEditProfile(userEditProfileVO);
|
userDAO.userEditProfile(userEditProfileVO);
|
||||||
return ResultUtil.success("修改成功");
|
return ResultUtil.success("修改成功");
|
||||||
|
@ -99,7 +96,6 @@ public class UserServiceImpl implements UserService {
|
||||||
@Override
|
@Override
|
||||||
@NeedRoleGroup("user.current.all")
|
@NeedRoleGroup("user.current.all")
|
||||||
public BaseResponse userCurrentAll(HttpServletRequest request, @NotNull UserAllCurrentVO userAllCurrentVO) {
|
public BaseResponse userCurrentAll(HttpServletRequest request, @NotNull UserAllCurrentVO userAllCurrentVO) {
|
||||||
log.info("\t> 执行 Service 层 UserService.userCurrentAll 方法");
|
|
||||||
// 检查数据
|
// 检查数据
|
||||||
if (userAllCurrentVO.getPage() == null || userAllCurrentVO.getPage() < 1) {
|
if (userAllCurrentVO.getPage() == null || userAllCurrentVO.getPage() < 1) {
|
||||||
userAllCurrentVO.setPage(1L);
|
userAllCurrentVO.setPage(1L);
|
||||||
|
@ -139,7 +135,6 @@ public class UserServiceImpl implements UserService {
|
||||||
String username,
|
String username,
|
||||||
String email,
|
String email,
|
||||||
String phone) {
|
String phone) {
|
||||||
log.info("\t> 执行 Service 层 UserService.userCurrent 方法");
|
|
||||||
if (id == null && username == null && email == null && phone == null) {
|
if (id == null && username == null && email == null && phone == null) {
|
||||||
// Token获取信息
|
// Token获取信息
|
||||||
UserDO userDO = userDAO.getUserById(Processing.getAuthHeaderToUserId(request));
|
UserDO userDO = userDAO.getUserById(Processing.getAuthHeaderToUserId(request));
|
||||||
|
@ -193,7 +188,6 @@ public class UserServiceImpl implements UserService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse userAdd(UserAddVO userAddVo, HttpServletRequest request) {
|
public BaseResponse userAdd(UserAddVO userAddVo, HttpServletRequest request) {
|
||||||
log.info("\t> 执行 Service 层 UserService.userAdd 方法");
|
|
||||||
// 检测用户是否为管理员
|
// 检测用户是否为管理员
|
||||||
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
||||||
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
||||||
|
@ -231,7 +225,6 @@ public class UserServiceImpl implements UserService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse userEdit(UserEditVO userEditVO, HttpServletRequest request) {
|
public BaseResponse userEdit(UserEditVO userEditVO, HttpServletRequest request) {
|
||||||
log.info("\t> 执行 Service 层 userEdit 方法");
|
|
||||||
// 检测用户是否为管理员
|
// 检测用户是否为管理员
|
||||||
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
if (!Processing.checkUserIsAdmin(request, roleDAO)) {
|
||||||
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
return ResultUtil.error(ErrorCode.NOT_ADMIN);
|
||||||
|
@ -265,8 +258,6 @@ public class UserServiceImpl implements UserService {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BaseResponse userProfileGet(HttpServletRequest request) {
|
public BaseResponse userProfileGet(HttpServletRequest request) {
|
||||||
log.info("\t> 执行 Service 层 UserService.userProfileGet 方法");
|
|
||||||
|
|
||||||
// 获取用户Id
|
// 获取用户Id
|
||||||
UserDO userDO = userDAO.getUserById(Processing.getAuthHeaderToUserId(request));
|
UserDO userDO = userDAO.getUserById(Processing.getAuthHeaderToUserId(request));
|
||||||
UserProfileVo userProfileVo = new UserProfileVo();
|
UserProfileVo userProfileVo = new UserProfileVo();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user