FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-04 22:41:24 +08:00
Code Packages Releases Activity

Optimized source code structure. Added api document to LoginController

Browse Source
This commit is contained in:
Fat Snake
2023-05-23 03:18:10 +08:00
parent dc32b1d234
commit 6dfcba36bb
74 changed files with 115 additions and 790 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Pinnacle/src/main/java/com/cfive/pinnacle/controller/AffairController.java
View File

@@ -1,13 +1,12 @@
package com.cfive.pinnacle.controller; package com.cfive.pinnacle.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.controller.permission.UserController;
import com.cfive.pinnacle.entity.Affair; import com.cfive.pinnacle.entity.Affair;
import com.cfive.pinnacle.entity.Attendance; import com.cfive.pinnacle.entity.permission.User;
import com.cfive.pinnacle.entity.User;
import com.cfive.pinnacle.entity.common.ResponseCode; import com.cfive.pinnacle.entity.common.ResponseCode;
import com.cfive.pinnacle.entity.common.ResponseResult; import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.service.IAffairService; import com.cfive.pinnacle.service.IAffairService;
import com.cfive.pinnacle.service.IUserService;
import com.cfive.pinnacle.utils.WebUtil; import com.cfive.pinnacle.utils.WebUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -41,7 +40,7 @@ public class AffairController {
@GetMapping("/add/getUser") @GetMapping("/add/getUser")
public ResponseResult getUser() { public ResponseResult getUser() {
List<User> userList = (List<User>)userController.getAllUser().getData(); List<User> userList = userController.getAllUser().getData();
return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK,"success",userList); return ResponseResult.build(ResponseCode.DATABASE_SELECT_OK,"success",userList);
}//获取数据库中所有用户 }//获取数据库中所有用户

18
Pinnacle/src/main/java/com/cfive/pinnacle/controller/UserWorkController.java
View File

@@ -1,18 +0,0 @@
package com.cfive.pinnacle.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 中间表-用户-工作事项 前端控制器
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@RestController
@RequestMapping("/userWork")
public class UserWorkController {
}

8
Pinnacle/src/main/java/com/cfive/pinnacle/controller/WorkController.java
View File

@@ -1,22 +1,14 @@
package com.cfive.pinnacle.controller; package com.cfive.pinnacle.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.cfive.pinnacle.entity.User;
import com.cfive.pinnacle.entity.UserWork; import com.cfive.pinnacle.entity.UserWork;
import com.cfive.pinnacle.entity.Work; import com.cfive.pinnacle.entity.Work;
import com.cfive.pinnacle.entity.common.ResponseCode; import com.cfive.pinnacle.entity.common.ResponseCode;
import com.cfive.pinnacle.entity.common.ResponseResult; import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.service.IUserWorkService;
import com.cfive.pinnacle.service.IWorkService; import com.cfive.pinnacle.service.IWorkService;
import com.cfive.pinnacle.service.impl.UserWorkServiceImpl;
import com.cfive.pinnacle.service.impl.WorkServiceImpl;
import com.cfive.pinnacle.utils.WebUtil; import com.cfive.pinnacle.utils.WebUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**

48
Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/ElementController.java
View File

@@ -1,48 +0,0 @@
package com.cfive.pinnacle.controller.permission;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.entity.permission.Element;
import com.cfive.pinnacle.service.permission.IElementService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* 页面元素 前端控制器
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@RestController
@RequestMapping("/element")
public class ElementController {
private IElementService elementService;
@Autowired
public void setElementService(IElementService elementService) {
this.elementService = elementService;
}
@GetMapping
public ResponseResult getAllElement() {
List<Element> elements = elementService.list();
return ResponseResult.databaseSelectSuccess(elements);
}
@GetMapping("/{id}")
public ResponseResult getElement(@PathVariable long id) {
LambdaQueryWrapper<Element> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Element::getId, id);
Element element = elementService.getOne(wrapper);
return ResponseResult.databaseSelectSuccess(element);
}
}

48
Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/FileController.java
View File

@@ -1,48 +0,0 @@
package com.cfive.pinnacle.controller.permission;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.entity.permission.File;
import com.cfive.pinnacle.service.permission.IFileService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* 文件 前端控制器
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@RestController
@RequestMapping("/file")
public class FileController {
private IFileService fileService;
@Autowired
public void setFileService(IFileService fileService) {
this.fileService = fileService;
}
@GetMapping
public ResponseResult getAllFile() {
List<File> files = fileService.list();
return ResponseResult.databaseSelectSuccess(files);
}
@GetMapping("/{id}")
public ResponseResult getFile(@PathVariable int id) {
LambdaQueryWrapper<File> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(File::getId, id);
File file = fileService.getOne(wrapper);
return ResponseResult.databaseSelectSuccess(file);
}
}

6
Pinnacle/src/main/java/com/cfive/pinnacle/controller/GroupController.java → Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/GroupController.java
View File

@@ -1,10 +1,10 @@
package com.cfive.pinnacle.controller; package com.cfive.pinnacle.controller.permission;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.entity.Group; import com.cfive.pinnacle.entity.permission.Group;
import com.cfive.pinnacle.entity.common.ResponseCode; import com.cfive.pinnacle.entity.common.ResponseCode;
import com.cfive.pinnacle.entity.common.ResponseResult; import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.service.IGroupService; import com.cfive.pinnacle.service.permission.IGroupService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.Parameters;

17
Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/LoginController.java
View File

@@ -1,10 +1,11 @@
package com.cfive.pinnacle.controller.permission; package com.cfive.pinnacle.controller.permission;
import com.cfive.pinnacle.entity.User; import com.cfive.pinnacle.entity.permission.User;
import com.cfive.pinnacle.entity.common.ResponseCode; import com.cfive.pinnacle.entity.common.ResponseCode;
import com.cfive.pinnacle.entity.common.ResponseResult; import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.service.permission.ILoginService; import com.cfive.pinnacle.service.permission.ILoginService;
import com.cfive.pinnacle.utils.WebUtil; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -13,6 +14,7 @@ import java.util.HashMap;
@RestController @RestController
@CrossOrigin @CrossOrigin
@Tag(name = "登录", description = "登录相关接口")
public class LoginController { public class LoginController {
private ILoginService loginService; private ILoginService loginService;
@@ -22,14 +24,16 @@ public class LoginController {
this.loginService = loginService; this.loginService = loginService;
} }
@Operation(summary = "登录")
@PostMapping("/login") @PostMapping("/login")
public ResponseResult login(@RequestBody User user) { public ResponseResult<HashMap<String, String>> login(@RequestBody User user) {
HashMap<String, String> hashMap = loginService.login(user); HashMap<String, String> hashMap = loginService.login(user);
return ResponseResult.build(ResponseCode.LOGIN_SUCCESS, "Login Success", hashMap); return ResponseResult.build(ResponseCode.LOGIN_SUCCESS, "Login Success", hashMap);
} }
@Operation(summary = "登出")
@RequestMapping("/logout") @RequestMapping("/logout")
public ResponseResult logout(HttpServletRequest request) { public ResponseResult<?> logout(HttpServletRequest request) {
boolean result = loginService.logout(request.getHeader("token")); boolean result = loginService.logout(request.getHeader("token"));
if (result) { if (result) {
return ResponseResult.build(ResponseCode.LOGOUT_SUCCESS, "Logout Success", null); return ResponseResult.build(ResponseCode.LOGOUT_SUCCESS, "Logout Success", null);
@@ -37,9 +41,4 @@ public class LoginController {
return ResponseResult.build(ResponseCode.LOGOUT_FAILED, "Logout Failed", null); return ResponseResult.build(ResponseCode.LOGOUT_FAILED, "Logout Failed", null);
} }
} }
@GetMapping("/userInfo")
public ResponseResult getUserInfo() {
return ResponseResult.success(WebUtil.getLoginUser());
}
} }

48
Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/MenuController.java
View File

@@ -1,48 +0,0 @@
package com.cfive.pinnacle.controller.permission;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.entity.permission.Menu;
import com.cfive.pinnacle.service.permission.IMenuService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* 菜单 前端控制器
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@RestController
@RequestMapping("/menu")
public class MenuController {
private IMenuService menuService;
@Autowired
public void setMenuService(IMenuService menuService) {
this.menuService = menuService;
}
@GetMapping
public ResponseResult getAllMenu() {
List<Menu> menus = menuService.list();
return ResponseResult.databaseSelectSuccess(menus);
}
@GetMapping("/{id}")
public ResponseResult getMenu(@PathVariable int id) {
LambdaQueryWrapper<Menu> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Menu::getId, id);
Menu menu = menuService.getOne(wrapper);
return ResponseResult.databaseSelectSuccess(menu);
}
}

48
Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/OperationController.java
View File

@@ -1,48 +0,0 @@
package com.cfive.pinnacle.controller.permission;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.entity.permission.Operation;
import com.cfive.pinnacle.service.permission.IOperationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* 功能 前端控制器
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@RestController
@RequestMapping("/operation")
public class OperationController {
private IOperationService operationService;
@Autowired
public void setOperationService(IOperationService operationService) {
this.operationService = operationService;
}
@GetMapping
public ResponseResult getAllOperation() {
List<Operation> operations = operationService.list();
return ResponseResult.databaseSelectSuccess(operations);
}
@GetMapping("/{id}")
public ResponseResult getOperation(@PathVariable int id) {
LambdaQueryWrapper<Operation> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(Operation::getId, id);
Operation operation = operationService.getOne(wrapper);
return ResponseResult.databaseSelectSuccess(operation);
}
}

4
Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/OperationLogController.java
View File

@@ -31,14 +31,14 @@ public class OperationLogController {
} }
@GetMapping @GetMapping
public ResponseResult getAllOperationLog() { public ResponseResult<List<OperationLog>> getAllOperationLog() {
List<OperationLog> operationLogs = operationLogService.list(); List<OperationLog> operationLogs = operationLogService.list();
return ResponseResult.databaseSelectSuccess(operationLogs); return ResponseResult.databaseSelectSuccess(operationLogs);
} }
@GetMapping("/{id}") @GetMapping("/{id}")
public ResponseResult getOperationLog(@PathVariable int id) { public ResponseResult<OperationLog> getOperationLog(@PathVariable int id) {
LambdaQueryWrapper<OperationLog> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OperationLog> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(OperationLog::getId, id); wrapper.eq(OperationLog::getId, id);
OperationLog operationLog = operationLogService.getOne(wrapper); OperationLog operationLog = operationLogService.getOne(wrapper);

46
Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/PowerTypeController.java
View File

@@ -1,46 +0,0 @@
package com.cfive.pinnacle.controller.permission;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.entity.permission.*;
import com.cfive.pinnacle.service.permission.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>
* 权限类型 前端控制器
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@RestController
@RequestMapping("/powerType")
public class PowerTypeController {
IPowerTypeService powerTypeService;
public void setPowerTypeService(IPowerTypeService powerTypeService) {
this.powerTypeService = powerTypeService;
}
@GetMapping
public ResponseResult getAllPowerType() {
List<PowerType> powerTypes = powerTypeService.list();
return ResponseResult.databaseSelectSuccess(powerTypes);
}
@GetMapping("/{id}")
public ResponseResult getPowerType(@PathVariable int id) {
LambdaQueryWrapper<PowerType> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(PowerType::getId, id);
PowerType powerType = powerTypeService.getOne(wrapper);
return ResponseResult.databaseSelectSuccess(powerType);
}
}

6
Pinnacle/src/main/java/com/cfive/pinnacle/controller/RoleController.java → Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/RoleController.java
View File

@@ -1,10 +1,10 @@
package com.cfive.pinnacle.controller; package com.cfive.pinnacle.controller.permission;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.entity.Role; import com.cfive.pinnacle.entity.permission.Role;
import com.cfive.pinnacle.entity.common.ResponseCode; import com.cfive.pinnacle.entity.common.ResponseCode;
import com.cfive.pinnacle.entity.common.ResponseResult; import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.service.IRoleService; import com.cfive.pinnacle.service.permission.IRoleService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.Parameters;

6
Pinnacle/src/main/java/com/cfive/pinnacle/controller/UserController.java → Pinnacle/src/main/java/com/cfive/pinnacle/controller/permission/UserController.java
View File

@@ -1,10 +1,10 @@
package com.cfive.pinnacle.controller; package com.cfive.pinnacle.controller.permission;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.entity.User; import com.cfive.pinnacle.entity.permission.User;
import com.cfive.pinnacle.entity.common.ResponseCode; import com.cfive.pinnacle.entity.common.ResponseCode;
import com.cfive.pinnacle.entity.common.ResponseResult; import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.service.IUserService; import com.cfive.pinnacle.service.permission.IUserService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

1
Pinnacle/src/main/java/com/cfive/pinnacle/entity/Attendance.java
View File

@@ -10,6 +10,7 @@ import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.cfive.pinnacle.entity.permission.User;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

1
Pinnacle/src/main/java/com/cfive/pinnacle/entity/Department.java
View File

@@ -10,6 +10,7 @@ import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import com.cfive.pinnacle.entity.permission.User;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data; import lombok.Data;

1
Pinnacle/src/main/java/com/cfive/pinnacle/entity/Notice.java
View File

@@ -11,6 +11,7 @@ import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import com.cfive.pinnacle.entity.permission.User;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

1
Pinnacle/src/main/java/com/cfive/pinnacle/entity/Work.java
View File

@@ -11,6 +11,7 @@ import java.io.Serializable;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import com.cfive.pinnacle.entity.permission.User;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

2
Pinnacle/src/main/java/com/cfive/pinnacle/entity/Group.java → Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Group.java
View File

@@ -1,4 +1,4 @@
package com.cfive.pinnacle.entity; package com.cfive.pinnacle.entity.permission;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

1
Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/LoginUser.java
View File

@@ -1,6 +1,5 @@
package com.cfive.pinnacle.entity.permission; package com.cfive.pinnacle.entity.permission;
import com.cfive.pinnacle.entity.User;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

4
Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/PowerSet.java
View File

@@ -18,11 +18,11 @@ public class PowerSet implements Serializable {
@Serial @Serial
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private List<Operation> operationList;
private List<Menu> menuList; private List<Menu> menuList;
private List<Element> elementList; private List<Element> elementList;
private List<Operation> operationList;
private List<File> fileList; private List<File> fileList;
} }

6
Pinnacle/src/main/java/com/cfive/pinnacle/entity/Role.java → Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/Role.java
View File

@@ -1,4 +1,4 @@
package com.cfive.pinnacle.entity; package com.cfive.pinnacle.entity.permission;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,10 +10,6 @@ import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import com.cfive.pinnacle.entity.permission.Element;
import com.cfive.pinnacle.entity.permission.Menu;
import com.cfive.pinnacle.entity.permission.Operation;
import com.cfive.pinnacle.entity.permission.Power;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
Pinnacle/src/main/java/com/cfive/pinnacle/entity/RoleGroup.java → Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/RoleGroup.java
View File

@@ -1,4 +1,4 @@
package com.cfive.pinnacle.entity; package com.cfive.pinnacle.entity.permission;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

6
Pinnacle/src/main/java/com/cfive/pinnacle/entity/User.java → Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/User.java
View File

@@ -1,4 +1,4 @@
package com.cfive.pinnacle.entity; package com.cfive.pinnacle.entity.permission;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,9 +9,7 @@ import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import com.cfive.pinnacle.entity.permission.Element; import com.cfive.pinnacle.entity.Staff;
import com.cfive.pinnacle.entity.permission.Menu;
import com.cfive.pinnacle.entity.permission.Operation;
import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data; import lombok.Data;

2
Pinnacle/src/main/java/com/cfive/pinnacle/entity/UserGroup.java → Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/UserGroup.java
View File

@@ -1,4 +1,4 @@
package com.cfive.pinnacle.entity; package com.cfive.pinnacle.entity.permission;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

2
Pinnacle/src/main/java/com/cfive/pinnacle/entity/UserRole.java → Pinnacle/src/main/java/com/cfive/pinnacle/entity/permission/UserRole.java
View File

@@ -1,4 +1,4 @@
package com.cfive.pinnacle.entity; package com.cfive.pinnacle.entity.permission;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

4
Pinnacle/src/main/java/com/cfive/pinnacle/mapper/GroupMapper.java → Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.java
View File

@@ -1,6 +1,6 @@
package com.cfive.pinnacle.mapper; package com.cfive.pinnacle.mapper.permission;
import com.cfive.pinnacle.entity.Group; import com.cfive.pinnacle.entity.permission.Group;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

18
Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/PowerTypeMapper.java
View File

@@ -1,18 +0,0 @@
package com.cfive.pinnacle.mapper.permission;
import com.cfive.pinnacle.entity.permission.PowerType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 权限类型 Mapper 接口
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@Mapper
public interface PowerTypeMapper extends BaseMapper<PowerType> {
}

4
Pinnacle/src/main/java/com/cfive/pinnacle/mapper/RoleGroupMapper.java → Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/RoleGroupMapper.java
View File

@@ -1,6 +1,6 @@
package com.cfive.pinnacle.mapper; package com.cfive.pinnacle.mapper.permission;
import com.cfive.pinnacle.entity.RoleGroup; import com.cfive.pinnacle.entity.permission.RoleGroup;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

4
Pinnacle/src/main/java/com/cfive/pinnacle/mapper/RoleMapper.java → Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/RoleMapper.java
View File

@@ -1,7 +1,7 @@
package com.cfive.pinnacle.mapper; package com.cfive.pinnacle.mapper.permission;
import java.util.List; import java.util.List;
import com.cfive.pinnacle.entity.Role; import com.cfive.pinnacle.entity.permission.Role;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

4
Pinnacle/src/main/java/com/cfive/pinnacle/mapper/UserGroupMapper.java → Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserGroupMapper.java
View File

@@ -1,6 +1,6 @@
package com.cfive.pinnacle.mapper; package com.cfive.pinnacle.mapper.permission;
import com.cfive.pinnacle.entity.UserGroup; import com.cfive.pinnacle.entity.permission.UserGroup;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

4
Pinnacle/src/main/java/com/cfive/pinnacle/mapper/UserMapper.java → Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java
View File

@@ -1,6 +1,6 @@
package com.cfive.pinnacle.mapper; package com.cfive.pinnacle.mapper.permission;
import com.cfive.pinnacle.entity.User; import com.cfive.pinnacle.entity.permission.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

4
Pinnacle/src/main/java/com/cfive/pinnacle/mapper/UserRoleMapper.java → Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserRoleMapper.java
View File

@@ -1,6 +1,6 @@
package com.cfive.pinnacle.mapper; package com.cfive.pinnacle.mapper.permission;
import com.cfive.pinnacle.entity.UserRole; import com.cfive.pinnacle.entity.permission.UserRole;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;

16
Pinnacle/src/main/java/com/cfive/pinnacle/service/IRoleGroupService.java
View File

@@ -1,16 +0,0 @@
package com.cfive.pinnacle.service;
import com.cfive.pinnacle.entity.RoleGroup;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 中间表-角色-用户组 服务类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
public interface IRoleGroupService extends IService<RoleGroup> {
}

16
Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserGroupService.java
View File

@@ -1,16 +0,0 @@
package com.cfive.pinnacle.service;
import com.cfive.pinnacle.entity.UserGroup;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 中间表-用户-用户组 服务类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
public interface IUserGroupService extends IService<UserGroup> {
}

16
Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserRoleService.java
View File

@@ -1,16 +0,0 @@
package com.cfive.pinnacle.service;
import com.cfive.pinnacle.entity.UserRole;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 中间表-用户-角色 服务类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
public interface IUserRoleService extends IService<UserRole> {
}

16
Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserWorkService.java
View File

@@ -1,16 +0,0 @@
package com.cfive.pinnacle.service;
import com.cfive.pinnacle.entity.UserWork;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 中间表-用户-工作事项 服务类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
public interface IUserWorkService extends IService<UserWork> {
}

11
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/AttendanceServiceImpl.java
View File

@@ -1,22 +1,16 @@
package com.cfive.pinnacle.service.impl; package com.cfive.pinnacle.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.cfive.pinnacle.entity.Attendance; import com.cfive.pinnacle.entity.Attendance;
import com.cfive.pinnacle.mapper.AttendanceMapper; import com.cfive.pinnacle.mapper.AttendanceMapper;
import com.cfive.pinnacle.mapper.UserMapper; import com.cfive.pinnacle.mapper.permission.UserMapper;
import com.cfive.pinnacle.service.IAttendanceService; import com.cfive.pinnacle.service.IAttendanceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Calendar;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@@ -41,8 +35,7 @@ public class AttendanceServiceImpl extends ServiceImpl<AttendanceMapper, Attenda
@Override @Override
public List<Attendance> getAttendanceAndUserByid(Long userId) { public List<Attendance> getAttendanceAndUserByid(Long userId) {
List<Attendance> attendances = attendanceMapper.getAttendanceAndUserByid(userId); return attendanceMapper.getAttendanceAndUserByid(userId);
return attendances;
} }
@Override @Override

7
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/DepartmentServiceImpl.java
View File

@@ -1,16 +1,12 @@
package com.cfive.pinnacle.service.impl; package com.cfive.pinnacle.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.entity.Department; import com.cfive.pinnacle.entity.Department;
import com.cfive.pinnacle.entity.User;
import com.cfive.pinnacle.mapper.DepartmentMapper; import com.cfive.pinnacle.mapper.DepartmentMapper;
import com.cfive.pinnacle.mapper.UserMapper;
import com.cfive.pinnacle.service.IDepartmentService; import com.cfive.pinnacle.service.IDepartmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
@@ -25,8 +21,7 @@ import java.util.List;
public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements IDepartmentService { public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements IDepartmentService {
@Autowired @Autowired
private DepartmentMapper departmentMapper; private DepartmentMapper departmentMapper;
@Autowired
private UserMapper userMapper;
@Override @Override
public List<Department> getDepartAndUser() { public List<Department> getDepartAndUser() {
return departmentMapper.getDepartAndUser(); return departmentMapper.getDepartAndUser();

4
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/NoticeServiceImpl.java
View File

@@ -5,12 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cfive.pinnacle.entity.Notice; import com.cfive.pinnacle.entity.Notice;
import com.cfive.pinnacle.entity.NoticeReceive; import com.cfive.pinnacle.entity.NoticeReceive;
import com.cfive.pinnacle.entity.common.ResponseCode;
import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.mapper.NoticeMapper; import com.cfive.pinnacle.mapper.NoticeMapper;
import com.cfive.pinnacle.mapper.NoticeReceiveMapper; import com.cfive.pinnacle.mapper.NoticeReceiveMapper;
import com.cfive.pinnacle.mapper.NoticeTypeMapper; import com.cfive.pinnacle.mapper.NoticeTypeMapper;
import com.cfive.pinnacle.mapper.UserMapper; import com.cfive.pinnacle.mapper.permission.UserMapper;
import com.cfive.pinnacle.service.INoticeService; import com.cfive.pinnacle.service.INoticeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cfive.pinnacle.utils.WebUtil; import com.cfive.pinnacle.utils.WebUtil;

20
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/RoleGroupServiceImpl.java
View File

@@ -1,20 +0,0 @@
package com.cfive.pinnacle.service.impl;
import com.cfive.pinnacle.entity.RoleGroup;
import com.cfive.pinnacle.mapper.RoleGroupMapper;
import com.cfive.pinnacle.service.IRoleGroupService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 中间表-角色-用户组 服务实现类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@Service
public class RoleGroupServiceImpl extends ServiceImpl<RoleGroupMapper, RoleGroup> implements IRoleGroupService {
}

20
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserGroupServiceImpl.java
View File

@@ -1,20 +0,0 @@
package com.cfive.pinnacle.service.impl;
import com.cfive.pinnacle.entity.UserGroup;
import com.cfive.pinnacle.mapper.UserGroupMapper;
import com.cfive.pinnacle.service.IUserGroupService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 中间表-用户-用户组 服务实现类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@Service
public class UserGroupServiceImpl extends ServiceImpl<UserGroupMapper, UserGroup> implements IUserGroupService {
}

20
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserRoleServiceImpl.java
View File

@@ -1,20 +0,0 @@
package com.cfive.pinnacle.service.impl;
import com.cfive.pinnacle.entity.UserRole;
import com.cfive.pinnacle.mapper.UserRoleMapper;
import com.cfive.pinnacle.service.IUserRoleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 中间表-用户-角色 服务实现类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@Service
public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> implements IUserRoleService {
}

20
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserWorkServiceImpl.java
View File

@@ -1,20 +0,0 @@
package com.cfive.pinnacle.service.impl;
import com.cfive.pinnacle.entity.UserWork;
import com.cfive.pinnacle.mapper.UserWorkMapper;
import com.cfive.pinnacle.service.IUserWorkService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 中间表-用户-工作事项 服务实现类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@Service
public class UserWorkServiceImpl extends ServiceImpl<UserWorkMapper, UserWork> implements IUserWorkService {
}

25
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/WorkServiceImpl.java
View File

@@ -2,11 +2,10 @@ package com.cfive.pinnacle.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.cfive.pinnacle.entity.Notice; import com.cfive.pinnacle.entity.permission.User;
import com.cfive.pinnacle.entity.User;
import com.cfive.pinnacle.entity.UserWork; import com.cfive.pinnacle.entity.UserWork;
import com.cfive.pinnacle.entity.Work; import com.cfive.pinnacle.entity.Work;
import com.cfive.pinnacle.mapper.UserMapper; import com.cfive.pinnacle.mapper.permission.UserMapper;
import com.cfive.pinnacle.mapper.UserWorkMapper; import com.cfive.pinnacle.mapper.UserWorkMapper;
import com.cfive.pinnacle.mapper.WorkMapper; import com.cfive.pinnacle.mapper.WorkMapper;
import com.cfive.pinnacle.service.IWorkService; import com.cfive.pinnacle.service.IWorkService;
@@ -17,8 +16,6 @@ import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.text.DecimalFormat;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**
@@ -101,7 +98,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, Work> implements IW
public double getProgress(Long workId) { public double getProgress(Long workId) {
double workNum = userWorkMapper.selectCount(new QueryWrapper<UserWork>().eq("work_id",workId)); double workNum = userWorkMapper.selectCount(new QueryWrapper<UserWork>().eq("work_id",workId));
double completeNum = userWorkMapper.selectCount(new QueryWrapper<UserWork>().eq("work_id",workId).eq("status",1)); double completeNum = userWorkMapper.selectCount(new QueryWrapper<UserWork>().eq("work_id",workId).eq("status",1));
double progress = 0; double progress;
progress = (completeNum / workNum) * 100; progress = (completeNum / workNum) * 100;
progress = (double) Math.round(progress * 100) / 100; progress = (double) Math.round(progress * 100) / 100;
return progress; return progress;
@@ -115,10 +112,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, Work> implements IW
@Override @Override
@Transactional(isolation = Isolation.READ_COMMITTED,propagation = Propagation.REQUIRED) @Transactional(isolation = Isolation.READ_COMMITTED,propagation = Propagation.REQUIRED)
public boolean addWork(Work work) { public boolean addWork(Work work) {
boolean flag = true; boolean flag = workMapper.insert(work) > 0;
if (workMapper.insert(work) <= 0) {
flag = false;
}
long workId = work.getId(); long workId = work.getId();
for (User user : for (User user :
work.getWorker()) { work.getWorker()) {
@@ -135,11 +129,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, Work> implements IW
@Override @Override
@Transactional(isolation = Isolation.READ_COMMITTED,propagation = Propagation.REQUIRED) @Transactional(isolation = Isolation.READ_COMMITTED,propagation = Propagation.REQUIRED)
public boolean deleteByWorkId(Long workId) { public boolean deleteByWorkId(Long workId) {
boolean flag = false; return userWorkMapper.delete(new QueryWrapper<UserWork>().eq("work_id", workId)) > 0 && workMapper.deleteById(workId) > 0;
if (userWorkMapper.delete(new QueryWrapper<UserWork>().eq("work_id", workId)) > 0 && workMapper.deleteById(workId) > 0) {
flag = true;
}
return flag;
} }
@Override @Override
@@ -151,10 +141,7 @@ public class WorkServiceImpl extends ServiceImpl<WorkMapper, Work> implements IW
@Override @Override
@Transactional(isolation = Isolation.READ_COMMITTED,propagation = Propagation.REQUIRED) @Transactional(isolation = Isolation.READ_COMMITTED,propagation = Propagation.REQUIRED)
public boolean updateWork(Work work) { public boolean updateWork(Work work) {
boolean flag = true; boolean flag = userWorkMapper.delete(new QueryWrapper<UserWork>().eq("work_id", work.getId())) > 0;
if (userWorkMapper.delete(new QueryWrapper<UserWork>().eq("work_id", work.getId())) <= 0) {
flag = false;
}
if (workMapper.update(null, new UpdateWrapper<Work>().eq("id", work.getId()).set("old", 1)) <= 0) { if (workMapper.update(null, new UpdateWrapper<Work>().eq("id", work.getId()).set("old", 1)) <= 0) {
flag = false; flag = false;
} }

16
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IElementService.java
View File

@@ -1,16 +0,0 @@
package com.cfive.pinnacle.service.permission;
import com.cfive.pinnacle.entity.permission.Element;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 页面元素 服务类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
public interface IElementService extends IService<Element> {
}

16
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IFileService.java
View File

@@ -1,16 +0,0 @@
package com.cfive.pinnacle.service.permission;
import com.cfive.pinnacle.entity.permission.File;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 文件 服务类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
public interface IFileService extends IService<File> {
}

4
Pinnacle/src/main/java/com/cfive/pinnacle/service/IGroupService.java → Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IGroupService.java
View File

@@ -1,6 +1,6 @@
package com.cfive.pinnacle.service; package com.cfive.pinnacle.service.permission;
import com.cfive.pinnacle.entity.Group; import com.cfive.pinnacle.entity.permission.Group;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;

2
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/ILoginService.java
View File

@@ -1,6 +1,6 @@
package com.cfive.pinnacle.service.permission; package com.cfive.pinnacle.service.permission;
import com.cfive.pinnacle.entity.User; import com.cfive.pinnacle.entity.permission.User;
import java.util.HashMap; import java.util.HashMap;

16
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IMenuService.java
View File

@@ -1,16 +0,0 @@
package com.cfive.pinnacle.service.permission;
import com.cfive.pinnacle.entity.permission.Menu;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 菜单 服务类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
public interface IMenuService extends IService<Menu> {
}

16
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IOperationService.java
View File

@@ -1,16 +0,0 @@
package com.cfive.pinnacle.service.permission;
import com.cfive.pinnacle.entity.permission.Operation;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 功能 服务类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
public interface IOperationService extends IService<Operation> {
}

16
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IPowerRoleService.java
View File

@@ -1,16 +0,0 @@
package com.cfive.pinnacle.service.permission;
import com.cfive.pinnacle.entity.permission.PowerRole;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 中间表-权限-角色 服务类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
public interface IPowerRoleService extends IService<PowerRole> {
}

16
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IPowerTypeService.java
View File

@@ -1,16 +0,0 @@
package com.cfive.pinnacle.service.permission;
import com.cfive.pinnacle.entity.permission.PowerType;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* <p>
* 权限类型 服务类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
public interface IPowerTypeService extends IService<PowerType> {
}

4
Pinnacle/src/main/java/com/cfive/pinnacle/service/IRoleService.java → Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IRoleService.java
View File

@@ -1,6 +1,6 @@
package com.cfive.pinnacle.service; package com.cfive.pinnacle.service.permission;
import com.cfive.pinnacle.entity.Role; import com.cfive.pinnacle.entity.permission.Role;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;

4
Pinnacle/src/main/java/com/cfive/pinnacle/service/IUserService.java → Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/IUserService.java
View File

@@ -1,6 +1,6 @@
package com.cfive.pinnacle.service; package com.cfive.pinnacle.service.permission;
import com.cfive.pinnacle.entity.User; import com.cfive.pinnacle.entity.permission.User;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List; import java.util.List;

20
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/ElementServiceImpl.java
View File

@@ -1,20 +0,0 @@
package com.cfive.pinnacle.service.permission.impl;
import com.cfive.pinnacle.entity.permission.Element;
import com.cfive.pinnacle.mapper.permission.ElementMapper;
import com.cfive.pinnacle.service.permission.IElementService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 页面元素 服务实现类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@Service
public class ElementServiceImpl extends ServiceImpl<ElementMapper, Element> implements IElementService {
}

20
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/FileServiceImpl.java
View File

@@ -1,20 +0,0 @@
package com.cfive.pinnacle.service.permission.impl;
import com.cfive.pinnacle.entity.permission.File;
import com.cfive.pinnacle.mapper.permission.FileMapper;
import com.cfive.pinnacle.service.permission.IFileService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 文件 服务实现类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@Service
public class FileServiceImpl extends ServiceImpl<FileMapper, File> implements IFileService {
}

12
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/GroupServiceImpl.java → Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java
View File

@@ -1,11 +1,11 @@
package com.cfive.pinnacle.service.impl; package com.cfive.pinnacle.service.permission.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.entity.Group; import com.cfive.pinnacle.entity.permission.Group;
import com.cfive.pinnacle.entity.RoleGroup; import com.cfive.pinnacle.entity.permission.RoleGroup;
import com.cfive.pinnacle.mapper.GroupMapper; import com.cfive.pinnacle.mapper.permission.GroupMapper;
import com.cfive.pinnacle.mapper.RoleGroupMapper; import com.cfive.pinnacle.mapper.permission.RoleGroupMapper;
import com.cfive.pinnacle.service.IGroupService; import com.cfive.pinnacle.service.permission.IGroupService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

2
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/LoginServiceImpl.java
View File

@@ -1,6 +1,6 @@
package com.cfive.pinnacle.service.permission.impl; package com.cfive.pinnacle.service.permission.impl;
import com.cfive.pinnacle.entity.User; import com.cfive.pinnacle.entity.permission.User;
import com.cfive.pinnacle.entity.permission.LoginUser; import com.cfive.pinnacle.entity.permission.LoginUser;
import com.cfive.pinnacle.service.permission.ILoginService; import com.cfive.pinnacle.service.permission.ILoginService;
import com.cfive.pinnacle.utils.JwtUtil; import com.cfive.pinnacle.utils.JwtUtil;

20
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/MenuServiceImpl.java
View File

@@ -1,20 +0,0 @@
package com.cfive.pinnacle.service.permission.impl;
import com.cfive.pinnacle.entity.permission.Menu;
import com.cfive.pinnacle.mapper.permission.MenuMapper;
import com.cfive.pinnacle.service.permission.IMenuService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 菜单 服务实现类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@Service
public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IMenuService {
}

20
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/OperationServiceImpl.java
View File

@@ -1,20 +0,0 @@
package com.cfive.pinnacle.service.permission.impl;
import com.cfive.pinnacle.entity.permission.Operation;
import com.cfive.pinnacle.mapper.permission.OperationMapper;
import com.cfive.pinnacle.service.permission.IOperationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 功能 服务实现类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@Service
public class OperationServiceImpl extends ServiceImpl<OperationMapper, Operation> implements IOperationService {
}

20
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerRoleServiceImpl.java
View File

@@ -1,20 +0,0 @@
package com.cfive.pinnacle.service.permission.impl;
import com.cfive.pinnacle.entity.permission.PowerRole;
import com.cfive.pinnacle.mapper.permission.PowerRoleMapper;
import com.cfive.pinnacle.service.permission.IPowerRoleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 中间表-权限-角色 服务实现类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@Service
public class PowerRoleServiceImpl extends ServiceImpl<PowerRoleMapper, PowerRole> implements IPowerRoleService {
}

37
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerServiceImpl.java
View File

@@ -1,7 +1,8 @@
package com.cfive.pinnacle.service.permission.impl; package com.cfive.pinnacle.service.permission.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.cfive.pinnacle.entity.permission.*; import com.cfive.pinnacle.entity.permission.*;
import com.cfive.pinnacle.mapper.permission.PowerMapper; import com.cfive.pinnacle.mapper.permission.*;
import com.cfive.pinnacle.service.permission.*; import com.cfive.pinnacle.service.permission.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -19,38 +20,38 @@ import java.util.List;
*/ */
@Service @Service
public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements IPowerService { public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements IPowerService {
private IOperationService operationService; private MenuMapper menuMapper;
private IMenuService menuService; private ElementMapper elementMapper;
private IElementService elementService; private OperationMapper operationMapper;
private IFileService fileService; private FileMapper fileMapper;
@Autowired @Autowired
public void setOperationService(IOperationService operationService) { public void setMenuMapper(MenuMapper menuMapper) {
this.operationService = operationService; this.menuMapper = menuMapper;
} }
@Autowired @Autowired
public void setMenuService(IMenuService menuService) { public void setElementMapper(ElementMapper elementMapper) {
this.menuService = menuService; this.elementMapper = elementMapper;
} }
@Autowired @Autowired
public void setElementService(IElementService elementService) { public void setOperationMapper(OperationMapper operationMapper) {
this.elementService = elementService; this.operationMapper = operationMapper;
} }
@Autowired @Autowired
public void setFileService(IFileService fileService) { public void setFileMapper(FileMapper fileMapper) {
this.fileService = fileService; this.fileMapper = fileMapper;
} }
@Override @Override
public PowerSet getAllPower() { public PowerSet getAllPower() {
List<Operation> operationList = operationService.list(); List<Menu> menuList = menuMapper.selectList(Wrappers.emptyWrapper());
List<Menu> menuList = menuService.list(); List<Element> elementList = elementMapper.selectList(Wrappers.emptyWrapper());
List<Element> elementList = elementService.list(); List<Operation> operationList = operationMapper.selectList(Wrappers.emptyWrapper());
List<File> fileList = fileService.list(); List<File> fileList = fileMapper.selectList(Wrappers.emptyWrapper());
return new PowerSet(operationList, menuList, elementList, fileList); return new PowerSet(menuList, elementList, operationList, fileList);
} }
} }

20
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/PowerTypeServiceImpl.java
View File

@@ -1,20 +0,0 @@
package com.cfive.pinnacle.service.permission.impl;
import com.cfive.pinnacle.entity.permission.PowerType;
import com.cfive.pinnacle.mapper.permission.PowerTypeMapper;
import com.cfive.pinnacle.service.permission.IPowerTypeService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
* <p>
* 权限类型 服务实现类
* </p>
*
* @author FatttSnake
* @since 2023-04-30
*/
@Service
public class PowerTypeServiceImpl extends ServiceImpl<PowerTypeMapper, PowerType> implements IPowerTypeService {
}

8
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/RoleServiceImpl.java → Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/RoleServiceImpl.java
View File

@@ -1,11 +1,11 @@
package com.cfive.pinnacle.service.impl; package com.cfive.pinnacle.service.permission.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.entity.Role; import com.cfive.pinnacle.entity.permission.Role;
import com.cfive.pinnacle.entity.permission.PowerRole; import com.cfive.pinnacle.entity.permission.PowerRole;
import com.cfive.pinnacle.mapper.RoleMapper; import com.cfive.pinnacle.mapper.permission.RoleMapper;
import com.cfive.pinnacle.mapper.permission.PowerRoleMapper; import com.cfive.pinnacle.mapper.permission.PowerRoleMapper;
import com.cfive.pinnacle.service.IRoleService; import com.cfive.pinnacle.service.permission.IRoleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

4
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserDetailsServiceImpl.java
View File

@@ -1,8 +1,8 @@
package com.cfive.pinnacle.service.permission.impl; package com.cfive.pinnacle.service.permission.impl;
import com.cfive.pinnacle.entity.User; import com.cfive.pinnacle.entity.permission.User;
import com.cfive.pinnacle.entity.permission.LoginUser; import com.cfive.pinnacle.entity.permission.LoginUser;
import com.cfive.pinnacle.service.IUserService; import com.cfive.pinnacle.service.permission.IUserService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;

21
Pinnacle/src/main/java/com/cfive/pinnacle/service/impl/UserServiceImpl.java → Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java
View File

@@ -1,15 +1,10 @@
package com.cfive.pinnacle.service.impl; package com.cfive.pinnacle.service.permission.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.entity.*; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.cfive.pinnacle.entity.permission.Element; import com.cfive.pinnacle.entity.permission.*;
import com.cfive.pinnacle.entity.permission.Menu; import com.cfive.pinnacle.mapper.permission.*;
import com.cfive.pinnacle.entity.permission.Operation; import com.cfive.pinnacle.service.permission.IUserService;
import com.cfive.pinnacle.mapper.*;
import com.cfive.pinnacle.mapper.permission.ElementMapper;
import com.cfive.pinnacle.mapper.permission.MenuMapper;
import com.cfive.pinnacle.mapper.permission.OperationMapper;
import com.cfive.pinnacle.service.IUserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cfive.pinnacle.utils.WebUtil; import com.cfive.pinnacle.utils.WebUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -104,9 +99,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
public User getUserWithPower(String username) { public User getUserWithPower(String username) {
User user = userMapper.getOneWithPowerByUsername(username); User user = userMapper.getOneWithPowerByUsername(username);
if (user.getId() == 1L) { if (user.getId() == 1L) {
List<Menu> menus = menuMapper.selectList(null); List<Menu> menus = menuMapper.selectList(Wrappers.emptyWrapper());
List<Element> elements = elementMapper.selectList(null); List<Element> elements = elementMapper.selectList(Wrappers.emptyWrapper());
List<Operation> operations = operationMapper.selectList(null); List<Operation> operations = operationMapper.selectList(Wrappers.emptyWrapper());
user.setMenus(menus); user.setMenus(menus);
user.setElements(elements); user.setElements(elements);
user.setOperations(operations); user.setOperations(operations);

2
Pinnacle/src/main/resources/mapper/GroupMapper.xml → Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cfive.pinnacle.mapper.GroupMapper"> <mapper namespace="com.cfive.pinnacle.mapper.permission.GroupMapper">
<select id="getAll" resultMap="groupMap"> <select id="getAll" resultMap="groupMap">
select t_group.id as group_id, select t_group.id as group_id,

2
Pinnacle/src/main/resources/mapper/RoleGroupMapper.xml → Pinnacle/src/main/resources/mapper/permission/RoleGroupMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cfive.pinnacle.mapper.RoleGroupMapper"> <mapper namespace="com.cfive.pinnacle.mapper.permission.RoleGroupMapper">
</mapper> </mapper>

2
Pinnacle/src/main/resources/mapper/RoleMapper.xml → Pinnacle/src/main/resources/mapper/permission/RoleMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cfive.pinnacle.mapper.RoleMapper"> <mapper namespace="com.cfive.pinnacle.mapper.permission.RoleMapper">
<select id="getAll" resultMap="roleMap"> <select id="getAll" resultMap="roleMap">
select t_role.id as role_id, select t_role.id as role_id,

2
Pinnacle/src/main/resources/mapper/UserGroupMapper.xml → Pinnacle/src/main/resources/mapper/permission/UserGroupMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cfive.pinnacle.mapper.UserGroupMapper"> <mapper namespace="com.cfive.pinnacle.mapper.permission.UserGroupMapper">
</mapper> </mapper>

2
Pinnacle/src/main/resources/mapper/UserMapper.xml → Pinnacle/src/main/resources/mapper/permission/UserMapper.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cfive.pinnacle.mapper.UserMapper"> <mapper namespace="com.cfive.pinnacle.mapper.permission.UserMapper">
<select id="getAll" resultMap="userMap"> <select id="getAll" resultMap="userMap">
select t_user.id as user_id, select t_user.id as user_id,

2
Pinnacle/src/main/resources/mapper/UserRoleMapper.xml → Pinnacle/src/main/resources/mapper/permission/UserRoleMapper.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cfive.pinnacle.mapper.UserRoleMapper"> <mapper namespace="com.cfive.pinnacle.mapper.permission.UserRoleMapper">
</mapper> </mapper>

2
Pinnacle/src/test/java/com/cfive/pinnacle/notice/NoticeTest.java
View File

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.cfive.pinnacle.controller.NoticeController; import com.cfive.pinnacle.controller.NoticeController;
import com.cfive.pinnacle.entity.*; import com.cfive.pinnacle.entity.*;
import com.cfive.pinnacle.entity.common.ResponseResult; import com.cfive.pinnacle.entity.common.ResponseResult;
import com.cfive.pinnacle.entity.permission.User;
import com.cfive.pinnacle.mapper.NoticeMapper; import com.cfive.pinnacle.mapper.NoticeMapper;
import com.cfive.pinnacle.service.*; import com.cfive.pinnacle.service.*;
import com.cfive.pinnacle.service.permission.IUserService;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;

3
Pinnacle/src/test/java/com/cfive/pinnacle/service/IUserServiceTest.java
View File

@@ -1,6 +1,7 @@
package com.cfive.pinnacle.service; package com.cfive.pinnacle.service;
import com.cfive.pinnacle.entity.User; import com.cfive.pinnacle.entity.permission.User;
import com.cfive.pinnacle.service.permission.IUserService;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;