From b7449f4c4e85f1973b7decd9953907ede2481d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=B1=BD=E5=A2=83?= <1537282342@qq.com> Date: Tue, 16 Jul 2024 14:06:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=95=B4=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RMS/pom.xml | 16 ++- .../main/java/com/demo/RmsApplication.java | 2 +- .../com/demo/controller/DeptController.java | 12 -- .../com/demo/controller/IndexController.java | 27 ++++ .../com/demo/controller/LogController.java | 12 -- .../com/demo/controller/LoginController.java | 40 ++++++ .../com/demo/controller/PostController.java | 13 -- .../com/demo/controller/RoleController.java | 12 -- .../manage/ProcessRecordController.java | 31 +++++ .../controller/setting/ProcessController.java | 40 ++++++ .../setting/ProcessTemplateController.java | 32 +++++ .../controller/system/DeptController.java | 41 ++++++ .../controller/system/LoginLogController.java | 28 ++++ .../{ => system}/MenuController.java | 33 +++-- .../controller/system/OperLogController.java | 32 +++++ .../controller/system/PostController.java | 48 +++++++ .../controller/system/RoleController.java | 45 +++++++ .../{ => system}/UserController.java | 121 +++++++++--------- .../controller/wechat/WeMenuController.java | 43 +++++++ RMS/src/main/java/com/demo/dao/Result.java | 26 ++++ .../main/java/com/demo/dao/UserQueryDao.java | 15 +++ .../exception/GlobalExceptionHandler.java | 18 +++ .../demo/interceptors/LoginInterceptors.java | 29 +++++ .../mapper/manage/ProcessRecordMapper.java | 9 ++ .../demo/mapper/setting/ProcessMapper.java | 9 ++ .../mapper/setting/ProcessTemplateMapper.java | 9 ++ .../demo/mapper/{ => system}/DeptMapper.java | 5 +- .../demo/mapper/system/LoginLogMapper.java | 9 ++ .../demo/mapper/{ => system}/MenuMapper.java | 2 +- .../com/demo/mapper/system/OperLogMapper.java | 10 ++ .../com/demo/mapper/system/PostMapper.java | 10 ++ .../com/demo/mapper/system/RoleMapper.java | 10 ++ .../demo/mapper/{ => system}/UserMapper.java | 8 +- .../com/demo/mapper/wechat/WeMenuMapper.java | 9 ++ .../main/java/com/demo/pojo/PO/Process.java | 22 ---- RMS/src/main/java/com/demo/pojo/R.java | 40 ------ .../com/demo/pojo/manage/ProcessRecord.java | 24 ++++ .../java/com/demo/pojo/setting/Process.java | 21 +++ .../demo/pojo/setting/ProcessTemplate.java | 29 +++++ .../main/java/com/demo/pojo/system/Dept.java | 44 +++++++ .../java/com/demo/pojo/system/LoginLog.java | 24 ++++ .../main/java/com/demo/pojo/system/Menu.java | 46 +++++++ .../java/com/demo/pojo/system/OperLog.java | 33 +++++ .../main/java/com/demo/pojo/system/Post.java | 23 ++++ .../main/java/com/demo/pojo/system/Role.java | 21 +++ .../main/java/com/demo/pojo/system/User.java | 32 +++++ .../java/com/demo/pojo/wechat/WeMenu.java | 42 ++++++ .../service/manage/ProcessRecordService.java | 8 ++ .../manage/impl/ProcessRecordServiceImpl.java | 12 ++ .../demo/service/setting/ProcessService.java | 8 ++ .../setting/ProcessTemplateService.java | 8 ++ .../setting/impl/ProcessServiceImpl.java | 12 ++ .../impl/ProcessTemplateServiceImpl.java | 13 ++ .../com/demo/service/system/DeptService.java | 8 ++ .../demo/service/system/LoginLogService.java | 7 + .../service/{ => system}/MenuService.java | 2 +- .../demo/service/system/OperLogService.java | 7 + .../com/demo/service/system/PostService.java | 7 + .../com/demo/service/system/RoleService.java | 8 ++ .../service/{ => system}/UserService.java | 2 +- .../service/system/impl/DeptServiceImpl.java | 15 +++ .../system/impl/LoginLogServiceImpl.java | 12 ++ .../{ => system}/impl/MenuServiceImpl.java | 6 +- .../system/impl/OperLogServiceImpl.java | 12 ++ .../service/system/impl/PostServiceImpl.java | 12 ++ .../service/system/impl/RoleServiceImpl.java | 12 ++ .../{ => system}/impl/UserServiceImpl.java | 6 +- .../demo/service/wechat/WeMenuService.java | 7 + .../wechat/impl/WeMenuServiceImpl.java | 12 ++ RMS/src/main/java/com/demo/tree/DeptTree.java | 29 +++++ RMS/src/main/java/com/demo/tree/MenuTree.java | 29 +++++ .../java/com/demo/tree/WechatMenuTree.java | 27 ++++ RMS/src/main/java/com/demo/util/JwtUtil.java | 30 +++++ RMS/src/main/java/com/demo/util/Md5Util.java | 73 +++++++++++ .../java/com/demo/util/ThreadLocalUtil.java | 26 ++++ .../com/demo/mapper/setting/ProcessMapper.xml | 9 ++ .../java/com/demo/RmsApplicationTests.java | 14 ++ 77 files changed, 1439 insertions(+), 201 deletions(-) delete mode 100644 RMS/src/main/java/com/demo/controller/DeptController.java create mode 100644 RMS/src/main/java/com/demo/controller/IndexController.java delete mode 100644 RMS/src/main/java/com/demo/controller/LogController.java create mode 100644 RMS/src/main/java/com/demo/controller/LoginController.java delete mode 100644 RMS/src/main/java/com/demo/controller/PostController.java delete mode 100644 RMS/src/main/java/com/demo/controller/RoleController.java create mode 100644 RMS/src/main/java/com/demo/controller/manage/ProcessRecordController.java create mode 100644 RMS/src/main/java/com/demo/controller/setting/ProcessController.java create mode 100644 RMS/src/main/java/com/demo/controller/setting/ProcessTemplateController.java create mode 100644 RMS/src/main/java/com/demo/controller/system/DeptController.java create mode 100644 RMS/src/main/java/com/demo/controller/system/LoginLogController.java rename RMS/src/main/java/com/demo/controller/{ => system}/MenuController.java (85%) create mode 100644 RMS/src/main/java/com/demo/controller/system/OperLogController.java create mode 100644 RMS/src/main/java/com/demo/controller/system/PostController.java create mode 100644 RMS/src/main/java/com/demo/controller/system/RoleController.java rename RMS/src/main/java/com/demo/controller/{ => system}/UserController.java (58%) create mode 100644 RMS/src/main/java/com/demo/controller/wechat/WeMenuController.java create mode 100644 RMS/src/main/java/com/demo/dao/Result.java create mode 100644 RMS/src/main/java/com/demo/dao/UserQueryDao.java create mode 100644 RMS/src/main/java/com/demo/exception/GlobalExceptionHandler.java create mode 100644 RMS/src/main/java/com/demo/interceptors/LoginInterceptors.java create mode 100644 RMS/src/main/java/com/demo/mapper/manage/ProcessRecordMapper.java create mode 100644 RMS/src/main/java/com/demo/mapper/setting/ProcessMapper.java create mode 100644 RMS/src/main/java/com/demo/mapper/setting/ProcessTemplateMapper.java rename RMS/src/main/java/com/demo/mapper/{ => system}/DeptMapper.java (71%) create mode 100644 RMS/src/main/java/com/demo/mapper/system/LoginLogMapper.java rename RMS/src/main/java/com/demo/mapper/{ => system}/MenuMapper.java (86%) create mode 100644 RMS/src/main/java/com/demo/mapper/system/OperLogMapper.java create mode 100644 RMS/src/main/java/com/demo/mapper/system/PostMapper.java create mode 100644 RMS/src/main/java/com/demo/mapper/system/RoleMapper.java rename RMS/src/main/java/com/demo/mapper/{ => system}/UserMapper.java (79%) create mode 100644 RMS/src/main/java/com/demo/mapper/wechat/WeMenuMapper.java delete mode 100644 RMS/src/main/java/com/demo/pojo/PO/Process.java delete mode 100644 RMS/src/main/java/com/demo/pojo/R.java create mode 100644 RMS/src/main/java/com/demo/pojo/manage/ProcessRecord.java create mode 100644 RMS/src/main/java/com/demo/pojo/setting/Process.java create mode 100644 RMS/src/main/java/com/demo/pojo/setting/ProcessTemplate.java create mode 100644 RMS/src/main/java/com/demo/pojo/system/Dept.java create mode 100644 RMS/src/main/java/com/demo/pojo/system/LoginLog.java create mode 100644 RMS/src/main/java/com/demo/pojo/system/Menu.java create mode 100644 RMS/src/main/java/com/demo/pojo/system/OperLog.java create mode 100644 RMS/src/main/java/com/demo/pojo/system/Post.java create mode 100644 RMS/src/main/java/com/demo/pojo/system/Role.java create mode 100644 RMS/src/main/java/com/demo/pojo/system/User.java create mode 100644 RMS/src/main/java/com/demo/pojo/wechat/WeMenu.java create mode 100644 RMS/src/main/java/com/demo/service/manage/ProcessRecordService.java create mode 100644 RMS/src/main/java/com/demo/service/manage/impl/ProcessRecordServiceImpl.java create mode 100644 RMS/src/main/java/com/demo/service/setting/ProcessService.java create mode 100644 RMS/src/main/java/com/demo/service/setting/ProcessTemplateService.java create mode 100644 RMS/src/main/java/com/demo/service/setting/impl/ProcessServiceImpl.java create mode 100644 RMS/src/main/java/com/demo/service/setting/impl/ProcessTemplateServiceImpl.java create mode 100644 RMS/src/main/java/com/demo/service/system/DeptService.java create mode 100644 RMS/src/main/java/com/demo/service/system/LoginLogService.java rename RMS/src/main/java/com/demo/service/{ => system}/MenuService.java (81%) create mode 100644 RMS/src/main/java/com/demo/service/system/OperLogService.java create mode 100644 RMS/src/main/java/com/demo/service/system/PostService.java create mode 100644 RMS/src/main/java/com/demo/service/system/RoleService.java rename RMS/src/main/java/com/demo/service/{ => system}/UserService.java (81%) create mode 100644 RMS/src/main/java/com/demo/service/system/impl/DeptServiceImpl.java create mode 100644 RMS/src/main/java/com/demo/service/system/impl/LoginLogServiceImpl.java rename RMS/src/main/java/com/demo/service/{ => system}/impl/MenuServiceImpl.java (61%) create mode 100644 RMS/src/main/java/com/demo/service/system/impl/OperLogServiceImpl.java create mode 100644 RMS/src/main/java/com/demo/service/system/impl/PostServiceImpl.java create mode 100644 RMS/src/main/java/com/demo/service/system/impl/RoleServiceImpl.java rename RMS/src/main/java/com/demo/service/{ => system}/impl/UserServiceImpl.java (66%) create mode 100644 RMS/src/main/java/com/demo/service/wechat/WeMenuService.java create mode 100644 RMS/src/main/java/com/demo/service/wechat/impl/WeMenuServiceImpl.java create mode 100644 RMS/src/main/java/com/demo/tree/DeptTree.java create mode 100644 RMS/src/main/java/com/demo/tree/MenuTree.java create mode 100644 RMS/src/main/java/com/demo/tree/WechatMenuTree.java create mode 100644 RMS/src/main/java/com/demo/util/JwtUtil.java create mode 100644 RMS/src/main/java/com/demo/util/Md5Util.java create mode 100644 RMS/src/main/java/com/demo/util/ThreadLocalUtil.java create mode 100644 RMS/src/main/resources/com/demo/mapper/setting/ProcessMapper.xml diff --git a/RMS/pom.xml b/RMS/pom.xml index 9973198..627cc46 100644 --- a/RMS/pom.xml +++ b/RMS/pom.xml @@ -49,7 +49,12 @@ com.baomidou mybatis-plus-boot-starter - 3.5.2 + 3.5.6 + + + cn.hutool + hutool-core + 5.8.27 com.alibaba @@ -61,6 +66,15 @@ spring-boot-devtools runtime + + org.springframework.boot + spring-boot-starter-validation + + + com.auth0 + java-jwt + 4.4.0 + diff --git a/RMS/src/main/java/com/demo/RmsApplication.java b/RMS/src/main/java/com/demo/RmsApplication.java index 59aa04e..1b89226 100644 --- a/RMS/src/main/java/com/demo/RmsApplication.java +++ b/RMS/src/main/java/com/demo/RmsApplication.java @@ -5,7 +5,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -//@MapperScan(basePackages = "com.demo") +@MapperScan(basePackages = "com.demo.mapper") public class RmsApplication { public static void main(String[] args) { diff --git a/RMS/src/main/java/com/demo/controller/DeptController.java b/RMS/src/main/java/com/demo/controller/DeptController.java deleted file mode 100644 index 27dd46e..0000000 --- a/RMS/src/main/java/com/demo/controller/DeptController.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.demo.controller; - -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -// 部门管理 -@RestController -@RequestMapping("/RMS/Dept") -@CrossOrigin // 跨域 -public class DeptController { -} diff --git a/RMS/src/main/java/com/demo/controller/IndexController.java b/RMS/src/main/java/com/demo/controller/IndexController.java new file mode 100644 index 0000000..c7d1db7 --- /dev/null +++ b/RMS/src/main/java/com/demo/controller/IndexController.java @@ -0,0 +1,27 @@ +//package com.demo.controller; +// +//import com.demo.Office.entity.system.Menu; +//import com.demo.Office.service.system.MenuService; +//import com.demo.Office.tree.MenuTree; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.web.bind.annotation.GetMapping; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +//import java.util.List; +// +////@RestController +////@RequestMapping +////public class IndexController { +//// +//// @Autowired +//// private MenuService menuService; +//// +//// @GetMapping +//// private List getMenuList() { +//// List list = menuService.lambdaQuery().select().list(); +//// MenuTree menuTree = new MenuTree(); +//// List tree = menuTree.createTree(list, 0); +//// return tree; +//// } +////} diff --git a/RMS/src/main/java/com/demo/controller/LogController.java b/RMS/src/main/java/com/demo/controller/LogController.java deleted file mode 100644 index 2834678..0000000 --- a/RMS/src/main/java/com/demo/controller/LogController.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.demo.controller; - -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -// 日志管理 -@RestController -@RequestMapping("/RMS/Log") -@CrossOrigin // 跨域 -public class LogController { -} diff --git a/RMS/src/main/java/com/demo/controller/LoginController.java b/RMS/src/main/java/com/demo/controller/LoginController.java new file mode 100644 index 0000000..7665a9e --- /dev/null +++ b/RMS/src/main/java/com/demo/controller/LoginController.java @@ -0,0 +1,40 @@ +//package com.demo.controller; +// +//import com.demo.Office.dao.Result; +//import com.demo.Office.entity.system.User; +//import com.demo.Office.service.system.UserService; +//import com.demo.Office.util.JwtUtil; +//import com.demo.Office.util.Md5Util; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +//import java.util.HashMap; +// +// +//@RestController +//@RequestMapping("/login") +//public class LoginController { +// @Autowired +// private UserService userService; +// +// +// /* +// 用户登录 +// */ +// @PostMapping +// public Result login(String username, String password) { +// User user = userService.lambdaQuery().eq(User::getUsername, username).one(); +// String md5String = Md5Util.getMD5String(password); +// String newPwd = user.getPassword(); +// if (!md5String.equals(newPwd)) { +// return Result.error("密码错误"); +// } +// HashMap claims = new HashMap<>(); +// claims.put("id", user.getId()); +// claims.put("username", username); +// String token = JwtUtil.genToken(claims); +// return Result.success(token); +// } +//} diff --git a/RMS/src/main/java/com/demo/controller/PostController.java b/RMS/src/main/java/com/demo/controller/PostController.java deleted file mode 100644 index 7386419..0000000 --- a/RMS/src/main/java/com/demo/controller/PostController.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.demo.controller; - -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -// 岗位管理 -@RestController -@RequestMapping("/RMS/Post") -@CrossOrigin // 跨域 -public class PostController { - -} diff --git a/RMS/src/main/java/com/demo/controller/RoleController.java b/RMS/src/main/java/com/demo/controller/RoleController.java deleted file mode 100644 index 004a981..0000000 --- a/RMS/src/main/java/com/demo/controller/RoleController.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.demo.controller; - - -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -// 角色管理 -@RestController -@RequestMapping("/RMS/Role") -@CrossOrigin // 跨域 -public class RoleController { -} diff --git a/RMS/src/main/java/com/demo/controller/manage/ProcessRecordController.java b/RMS/src/main/java/com/demo/controller/manage/ProcessRecordController.java new file mode 100644 index 0000000..a122f00 --- /dev/null +++ b/RMS/src/main/java/com/demo/controller/manage/ProcessRecordController.java @@ -0,0 +1,31 @@ +package com.demo.controller.manage; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import com.demo.dao.Result; +import com.demo.pojo.manage.ProcessRecord; +import com.demo.service.manage.ProcessRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/manage/processRecord") +public class ProcessRecordController { + + @Autowired + private ProcessRecordService processRecordService; + + @GetMapping + public Result> getProcessRecord(int pageNum, int pageSize, + @RequestParam(required = false,defaultValue = "") String description, + @RequestParam(required = false,defaultValue = "") String status) { + Page page = processRecordService.lambdaQuery() + .like(ProcessRecord::getDescription, description) + .like(ProcessRecord::getStatus, status) + .page(Page.of(pageNum, pageSize)); + return Result.success(page); + } +} diff --git a/RMS/src/main/java/com/demo/controller/setting/ProcessController.java b/RMS/src/main/java/com/demo/controller/setting/ProcessController.java new file mode 100644 index 0000000..929b17f --- /dev/null +++ b/RMS/src/main/java/com/demo/controller/setting/ProcessController.java @@ -0,0 +1,40 @@ +package com.demo.controller.setting; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import com.demo.dao.Result; +import com.demo.service.setting.ProcessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.demo.pojo.setting.Process; + +@RestController +@RequestMapping("/processSet/processType") +public class ProcessController { + @Autowired + private ProcessService processService; + + @PostMapping + public Result addProcess(@RequestBody Process process) { + processService.save(process); + return Result.success(); + } + + @DeleteMapping + public Result deleteProcess(@RequestParam int id) { + processService.removeById(id); + return Result.success(); + } + + @PutMapping + public Result updateProcess(@RequestBody Process process) { + processService.updateById(process); + return Result.success(); + } + @GetMapping + public Result> getProcess(int pageNum, int pageSize) { + + Page page = processService.lambdaQuery().page(Page.of(pageNum, pageSize)); + return Result.success(page); + } +} diff --git a/RMS/src/main/java/com/demo/controller/setting/ProcessTemplateController.java b/RMS/src/main/java/com/demo/controller/setting/ProcessTemplateController.java new file mode 100644 index 0000000..68a340d --- /dev/null +++ b/RMS/src/main/java/com/demo/controller/setting/ProcessTemplateController.java @@ -0,0 +1,32 @@ +package com.demo.controller.setting; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import com.demo.dao.Result; +import com.demo.pojo.setting.ProcessTemplate; +import com.demo.service.setting.ProcessTemplateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/processSet/template") +public class ProcessTemplateController { + @Autowired + private ProcessTemplateService processTemplateService; + + @PostMapping + public Result addTemplate(@RequestBody ProcessTemplate processTemplate) { + processTemplateService.save(processTemplate); + return Result.success(); + } + @GetMapping + public Result> getTemplate(int pageNum, int pageSize) { + Page page = processTemplateService.lambdaQuery().page(Page.of(pageNum, pageSize)); + return Result.success(page); + } + @DeleteMapping + public Result deleteTemplate(@RequestParam int id) { + processTemplateService.removeById(id); + return Result.success(); + } +} diff --git a/RMS/src/main/java/com/demo/controller/system/DeptController.java b/RMS/src/main/java/com/demo/controller/system/DeptController.java new file mode 100644 index 0000000..e41a446 --- /dev/null +++ b/RMS/src/main/java/com/demo/controller/system/DeptController.java @@ -0,0 +1,41 @@ +package com.demo.controller.system; + + +import com.demo.dao.Result; +import com.demo.pojo.system.Dept; +import com.demo.service.system.DeptService; +import com.demo.tree.DeptTree; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/system/dept") +public class DeptController { + @Autowired + private DeptService deptService; + + @PostMapping + private Result> addDept(@RequestBody Dept dept) { + deptService.save(dept); + return Result.success(); + } + @DeleteMapping + private Result deleteDept(@RequestParam int id) { + deptService.removeById(id); + return Result.success(); + } + @PutMapping + private Result updateDept(@RequestBody Dept dept) { + deptService.updateById(dept); + return Result.success(); + } + @GetMapping + private Result> getDeptList() { + List list = deptService.lambdaQuery().select().list(); + DeptTree deptTree = new DeptTree(); + deptTree.createTree(list,0); + return Result.success(list); + } +} diff --git a/RMS/src/main/java/com/demo/controller/system/LoginLogController.java b/RMS/src/main/java/com/demo/controller/system/LoginLogController.java new file mode 100644 index 0000000..a88952e --- /dev/null +++ b/RMS/src/main/java/com/demo/controller/system/LoginLogController.java @@ -0,0 +1,28 @@ +package com.demo.controller.system; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import com.demo.dao.Result; +import com.demo.pojo.system.LoginLog; +import com.demo.service.system.LoginLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/system/loginLog") +public class LoginLogController { + @Autowired + private LoginLogService loginLogService; + + @GetMapping + public Result> getLoginLog(int pageNum, int pageSize, + @RequestParam(required = false,defaultValue = "") String username) { + Page page = loginLogService.lambdaQuery() + .like(LoginLog::getUsername, username) + .page(Page.of(pageNum, pageSize)); + return Result.success(page); + } +} diff --git a/RMS/src/main/java/com/demo/controller/MenuController.java b/RMS/src/main/java/com/demo/controller/system/MenuController.java similarity index 85% rename from RMS/src/main/java/com/demo/controller/MenuController.java rename to RMS/src/main/java/com/demo/controller/system/MenuController.java index a21eb35..9b2dac7 100644 --- a/RMS/src/main/java/com/demo/controller/MenuController.java +++ b/RMS/src/main/java/com/demo/controller/system/MenuController.java @@ -1,10 +1,9 @@ -package com.demo.controller; +package com.demo.controller.system; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.demo.mapper.MenuMapper; +import com.demo.mapper.system.MenuMapper; import com.demo.pojo.PO.Menu; -import com.demo.pojo.PO.User; -import com.demo.pojo.R; +import com.demo.dao.Result; import com.demo.pojo.VO.VOMenu; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -21,7 +20,7 @@ public class MenuController { @Autowired private MenuMapper menuMapper; @GetMapping - public R getAllMenu() { + public Result getAllMenu() { List vodMenuList =menuMapper.selectList(null); // 初始化最外层转输出对象 List vodMenuVOList = vodMenuList.stream() @@ -42,7 +41,7 @@ public class MenuController { }).collect(Collectors.toList()); List VOMenus = getMenuStream(vodMenuList, vodMenuVOList); - return new R(true,"", VOMenus); + return Result.success(VOMenus); } public List getMenuStream(List vodMenuList, List vodMenuVOList){ List VOMenu1 = vodMenuVOList.stream() @@ -89,31 +88,31 @@ public class MenuController { } // 新增菜单表 @PostMapping(value = "/addMenu") - public R addMenu(@RequestBody Menu menu) { + public Result addMenu(@RequestBody Menu menu) { // 写死新增的是菜单表 menu.setParentId(0); - return new R(true,"", menuMapper.insert(menu)); + return Result.success(menuMapper.insert(menu)); } // 新增子菜单 @PostMapping(value = "/addSonMenu") - public R addSonMenu(@RequestBody Menu menu) { - return new R(true,"", menuMapper.insert(menu)); + public Result addSonMenu(@RequestBody Menu menu) { + return Result.success(menuMapper.insert(menu)); } // 设置菜单状态码，把新的状态码修改好放对象里传过来，记得带上id @PutMapping(value = "/updateMenuStatus") - public R updateMenuStatus(@RequestBody Menu menu){ + public Result updateMenuStatus(@RequestBody Menu menu){ String MenuStatus = "status = "+String.valueOf(menu.getStatus()); UpdateWrapper queryWrapper = new UpdateWrapper() .eq("id", menu.getId()) .setSql(MenuStatus); - return new R(true,"",menuMapper.update( null,queryWrapper)); + return Result.success(menuMapper.update( null,queryWrapper)); } // 修改菜单信息 @PutMapping(value = "/updateMenu") - public R updateMenu(@RequestBody Menu menu){ - return new R(true,"",menuMapper.updateById(menu)); + public Result updateMenu(@RequestBody Menu menu){ + return Result.success(menuMapper.updateById(menu)); } public List i = new ArrayList<>(); @@ -122,7 +121,7 @@ public class MenuController { menu1.add(menu); menu1.stream().map(m->{ List menu2 = allMenu.stream().filter(m2->{ - return m2.getParentId().equals(m.getId());} + return m2.getParentId().equals(m.getId());} ).map(m2->{ i.add(m2); getAllDelMenu(allMenu,m2); @@ -135,11 +134,11 @@ public class MenuController { // 删除菜单以及其子菜单 @DeleteMapping(value = "/delMenu") - public R delMenu(@RequestBody Menu menu){ + public Result delMenu(@RequestBody Menu menu){ List allMenu = menuMapper.selectList(null); i.add(menu); getAllDelMenu(allMenu,menu); List id= i.stream().map(Menu::getId).collect(Collectors.toList()); - return new R(true,"",menuMapper.deleteBatchIds(id)); + return Result.success(menuMapper.deleteBatchIds(id)); } } diff --git a/RMS/src/main/java/com/demo/controller/system/OperLogController.java b/RMS/src/main/java/com/demo/controller/system/OperLogController.java new file mode 100644 index 0000000..10c9f9a --- /dev/null +++ b/RMS/src/main/java/com/demo/controller/system/OperLogController.java @@ -0,0 +1,32 @@ +package com.demo.controller.system; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import com.demo.dao.Result; +import com.demo.pojo.system.OperLog; +import com.demo.service.system.OperLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/system/operLog") +public class OperLogController { + @Autowired + private OperLogService operLogService; + + @PostMapping + public Result addOperLog(@RequestBody OperLog operLog) { + operLogService.save(operLog); + return Result.success(); + } + @GetMapping + public Result> getOperLogList(int pageNum, int pageSize, + @RequestParam(required = false,defaultValue = "") String title, + @RequestParam(required = false,defaultValue = "") String operName) { + Page page = operLogService.lambdaQuery() + .like(OperLog::getTitle, title) + .like(OperLog::getOperName, operName) + .page(Page.of(pageNum, pageSize)); + return Result.success(page); + } +} diff --git a/RMS/src/main/java/com/demo/controller/system/PostController.java b/RMS/src/main/java/com/demo/controller/system/PostController.java new file mode 100644 index 0000000..4c7d206 --- /dev/null +++ b/RMS/src/main/java/com/demo/controller/system/PostController.java @@ -0,0 +1,48 @@ +package com.demo.controller.system; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import com.demo.dao.Result; +import com.demo.pojo.system.Post; +import com.demo.service.system.PostService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/system/post") +public class PostController { + + @Autowired + private PostService postService; + + @PostMapping + public Result addPost(@RequestBody Post post) { + postService.save(post); + return Result.success(); + } + + @DeleteMapping + public Result deletePost(@RequestParam int id) { + postService.removeById(id); + return Result.success(); + } + + @PutMapping + public Result updatePost(@RequestBody Post post) { + postService.updateById(post); + return Result.success(); + } + + @GetMapping + public Result getPost(int pageNum, int pageSize, + @RequestParam(required = false,defaultValue = "") String postName, + @RequestParam(required = false,defaultValue = "") String postCode, + @RequestParam(required = false,defaultValue = "") String status) { + Page page = postService.lambdaQuery() + .like(Post::getName,postName) + .like(Post::getPostCode,postCode) + .like(Post::getStatus,status) + .page(Page.of(pageNum, pageSize)); + return Result.success(page); + } +} diff --git a/RMS/src/main/java/com/demo/controller/system/RoleController.java b/RMS/src/main/java/com/demo/controller/system/RoleController.java new file mode 100644 index 0000000..7b259d8 --- /dev/null +++ b/RMS/src/main/java/com/demo/controller/system/RoleController.java @@ -0,0 +1,45 @@ +package com.demo.controller.system; + + + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; + +import com.demo.dao.Result; +import com.demo.pojo.system.Role; +import com.demo.service.system.RoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +@Validated +@RestController +@RequestMapping("/system/role") +public class RoleController { + + @Autowired + private RoleService roleService; + + @PostMapping + public Result addRole(@RequestBody Role role) { + boolean save = roleService.save(role); + return Result.success(save); + } + + @DeleteMapping + public Result deleteRole(@RequestParam int id) { + roleService.removeById(id); + return Result.success(); + } + + @PutMapping + public Result updateRole(@RequestBody Role role) { + roleService.updateById(role); + return Result.success(); + } + + @GetMapping + public Result getRoles(int pageNum, int pageSize,@RequestParam(required = false ,defaultValue = "") String roleName ) { + Page page = roleService.lambdaQuery().like(Role::getRoleName,roleName).page(Page.of(pageNum, pageSize)); + return Result.success(page); + } +} diff --git a/RMS/src/main/java/com/demo/controller/UserController.java b/RMS/src/main/java/com/demo/controller/system/UserController.java similarity index 58% rename from RMS/src/main/java/com/demo/controller/UserController.java rename to RMS/src/main/java/com/demo/controller/system/UserController.java index ed53907..3564225 100644 --- a/RMS/src/main/java/com/demo/controller/UserController.java +++ b/RMS/src/main/java/com/demo/controller/system/UserController.java @@ -1,23 +1,22 @@ -package com.demo.controller; +package com.demo.controller.system; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.demo.mapper.DeptMapper; -import com.demo.mapper.UserMapper; +import com.demo.mapper.system.DeptMapper; +import com.demo.mapper.system.UserMapper; import com.demo.pojo.DTO.DTOUserDept; import com.demo.pojo.DTO.DTOUserPost; import com.demo.pojo.DTO.DTOUserRole; -import com.demo.pojo.PO.UserRole; +import com.demo.pojo.system.Dept; import com.demo.pojo.VO.VODeptId; -import com.demo.pojo.PO.Dept; + import com.demo.pojo.PO.User; -import com.demo.pojo.R; +import com.demo.dao.Result; import com.demo.pojo.VO.VOUser; -import com.demo.service.UserService; +import com.demo.service.system.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -36,38 +35,43 @@ public class UserController { private DeptMapper deptMapper; // 获取左侧树状图，点击后拿到树状图点击的treePath，显示归属的人员 // 默认进去给个1就能显示全部 @GetMapping - public R getAllUser(String treePath){ + public Result getAllUser(String treePath){ // 拿到tree数字，查询树下的机构id List user1 = userMapper.selectDeptTree("%"+treePath+"%"); // 查询归属于以上机构id的人 - System.out.println(user1); QueryWrapper wrapper = new QueryWrapper() .in("dept_id", user1); - List userList = userMapper.selectList(wrapper) - .stream().map(m->{ - VOUser user = new VOUser(); - user.setId(m.getId()); - user.setUsername(m.getUsername()); - user.setName(m.getName()); - user.setPhone(m.getPhone()); - user.setStatus(m.getStatus()); - user.setCreateTime(m.getCreateTime()); - // 调岗位表一一对应 - List getPost = getPost(); - getPost.stream().filter(m2-> m2.getId().equals(m.getPostId())).forEach(m2->{ - user.setPost(m2.getName()); - }); - List getRole = getRole(); - getRole.stream().filter(m2-> m2.getUserId().equals(m.getId())).forEach(m2->{ - user.setRole(m2.getRoleName()); - }); - List getDept = getDept(); - getDept.stream().filter(m2-> m2.getId().equals(m.getDeptId())).forEach(m2->{ - user.setDept(m2.getDeptName()); - }); - return user; - }).collect(Collectors.toList()); - return new R(true,"",userList); + List userList = userMapper.selectList(wrapper); + List userList1 = makeUserToVO(userList); + return Result.success(userList1); + } + + // 将User表的信息转化为VOUser的信息 + public List makeUserToVO(List userList){ + List userList1 = userList.stream().map(m->{ + VOUser user = new VOUser(); + user.setId(m.getId()); + user.setUsername(m.getUsername()); + user.setName(m.getName()); + user.setPhone(m.getPhone()); + user.setStatus(m.getStatus()); + user.setCreateTime(m.getCreateTime()); + // 调岗位表一一对应 + List getPost = getPost(); + getPost.stream().filter(m2-> m2.getId().equals(m.getPostId())).forEach(m2->{ + user.setPost(m2.getName()); + }); + List getRole = getRole(); + getRole.stream().filter(m2-> m2.getUserId().equals(m.getId())).forEach(m2->{ + user.setRole(m2.getRoleName()); + }); + List getDept = getDept(); + getDept.stream().filter(m2-> m2.getId().equals(m.getDeptId())).forEach(m2->{ + user.setDept(m2.getDeptName()); + }); + return user; + }).collect(Collectors.toList()); + return userList1; } // 这几个是中间查询方法 @@ -83,9 +87,7 @@ public class UserController { } // 模糊查询 @GetMapping(value = "/getLike") - public R getLike(String need){ - System.out.println(need); - return new R(true,"",userMapper.selectLikeUser("%"+need+"%")); + public Result getLike(String need){return Result.success( makeUserToVO(userMapper.selectLikeUser("%"+need+"%"))); } // 递归分层级 部门 @@ -118,7 +120,7 @@ public class UserController { } // 递归分层级 @GetMapping(value = "/get") - public R getByDept(){ + public Result getByDept(){ //选择一次性拿出数据避免多次读取数据库费时间 List userList = deptMapper.selectList(null); // 转中转类型 @@ -132,44 +134,49 @@ public class UserController { List getUserId = getDeptStream(userList,userId.subList(0,1)); - return new R(true,"",getUserId); + return Result.success(getUserId); } //新增用户 @PostMapping(value = "/addUser") - public R addUser(@RequestBody User user){ - return new R(true,"",userMapper.insert(user)); + public Result addUser(@RequestBody User user){ + return Result.success(userMapper.insert(user)); } //修改用户信息 - @PutMapping(value = "putUser") - public R putUser(@RequestBody User user){ - return new R(true,"",userMapper.updateById(user)); + @PutMapping(value = "/putUser") + public Result putUser(@RequestBody User user){ + return Result.success(userMapper.updateById(user)); } // 设置用户状态码，把新的状态码修改好放对象里传过来，记得带上id - @PutMapping(value = "putUserStatus") - public R putUserStatus(@RequestBody User user){ + @PutMapping(value = "/putUserStatus") + public Result putUserStatus(@RequestBody User user){ String UserStatus = "status = "+String.valueOf(user.getStatus()); UpdateWrapper queryWrapper = new UpdateWrapper() .eq("id", user.getId()) .setSql(UserStatus); - return new R(true,"",userMapper.update( null,queryWrapper)); + return Result.success(userMapper.update( null,queryWrapper)); } // 分配角色 - @PutMapping(value = "putUserRole") - public R putUserDept(@RequestBody User user){ + @GetMapping(value = "/getPutUserRole") + public Result getPutUserDept(Integer userId){ // 先用上面getRole拉取角色表做多选框选择 - // 用户id读取user_role联表role表格查到这个用户的角色信息 - List userRoleList = userMapper.selectUserRole(user.getId()); - return new R(true,"",userRoleList); + // 用户id读取user_role联表role表格查到这个用户的角色信息/已经排除过isDeleted + List userRoleList = userMapper.selectUserRole(userId); + return Result.success( userRoleList); } - // 删除用户 - @DeleteMapping(value = "delUser") - public R delUser(@RequestBody User user){ - return new R(true,"",userMapper.deleteById(user.getId())); + // 修改时只能单独修改哦，前端注意（问我为什么？因为我想不出批量修改不同数值该怎么写sql语句） + @PutMapping(value = "/putUserRole") + public Result putUserRole(@RequestBody DTOUserRole userRole){ + return Result.success( userMapper.updateRoleMenu(userRole.getRoleId(),userRole.getUserId())); } + // 删除用户 + @DeleteMapping(value = "/delUser") + public Result delUser(@RequestBody User user){ + return Result.success( userMapper.deleteById(user.getId())); + } } diff --git a/RMS/src/main/java/com/demo/controller/wechat/WeMenuController.java b/RMS/src/main/java/com/demo/controller/wechat/WeMenuController.java new file mode 100644 index 0000000..d8504ed --- /dev/null +++ b/RMS/src/main/java/com/demo/controller/wechat/WeMenuController.java @@ -0,0 +1,43 @@ +package com.demo.controller.wechat; + +import com.demo.dao.Result; +import com.demo.pojo.wechat.WeMenu; +import com.demo.service.wechat.WeMenuService; +import com.demo.tree.WechatMenuTree; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/wechat/menu") +public class WeMenuController { + @Autowired + private WeMenuService weMenuService; + + @PostMapping + public Result addMenu(@RequestBody WeMenu menu) { + weMenuService.save(menu); + return Result.success(); + } + + @DeleteMapping + public Result deleteMenu(@RequestParam int id) { + weMenuService.removeById(id); + return Result.success(); + } + + @PutMapping + public Result updateMenu(@RequestBody WeMenu menu) { + weMenuService.updateById(menu); + return Result.success(); + } + + @GetMapping + private Result> getMenuList() { + List list = weMenuService.lambdaQuery().select().list(); + WechatMenuTree wechatMenuTree = new WechatMenuTree(); + List tree = wechatMenuTree.createTree(list, 0); + return Result.success(tree); + } +} diff --git a/RMS/src/main/java/com/demo/dao/Result.java b/RMS/src/main/java/com/demo/dao/Result.java new file mode 100644 index 0000000..5756e21 --- /dev/null +++ b/RMS/src/main/java/com/demo/dao/Result.java @@ -0,0 +1,26 @@ +package com.demo.dao; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class Result { + private Integer code; + private String msg; + private T data; + + public static Result success() { + return new Result(0, "操作成功", null); + } + + public static Result success(E data) { + return new Result(0, "操作成功", data); + } + + public static Result error(String msg) { + return new Result(0, msg, null); + } +} diff --git a/RMS/src/main/java/com/demo/dao/UserQueryDao.java b/RMS/src/main/java/com/demo/dao/UserQueryDao.java new file mode 100644 index 0000000..4b19e4c --- /dev/null +++ b/RMS/src/main/java/com/demo/dao/UserQueryDao.java @@ -0,0 +1,15 @@ +package com.demo.dao; + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class UserQueryDao { + private String KeyWord; + private String roleId; + private String postId; +} diff --git a/RMS/src/main/java/com/demo/exception/GlobalExceptionHandler.java b/RMS/src/main/java/com/demo/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..4616a1a --- /dev/null +++ b/RMS/src/main/java/com/demo/exception/GlobalExceptionHandler.java @@ -0,0 +1,18 @@ +package com.demo.exception; + + +import com.demo.dao.Result; +import org.springframework.util.StringUtils; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(Exception.class) + public Result handleException(Exception e){ + e.printStackTrace(); + return Result.error(StringUtils.hasLength(e.getMessage())? e.getMessage() : "操作失败"); + } +} + diff --git a/RMS/src/main/java/com/demo/interceptors/LoginInterceptors.java b/RMS/src/main/java/com/demo/interceptors/LoginInterceptors.java new file mode 100644 index 0000000..2de5657 --- /dev/null +++ b/RMS/src/main/java/com/demo/interceptors/LoginInterceptors.java @@ -0,0 +1,29 @@ +package com.demo.interceptors; +/* +登录拦截器 + */ + + + +import com.demo.util.JwtUtil; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.HandlerInterceptor; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; + +@Component +public class LoginInterceptors implements HandlerInterceptor { + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + String token = request.getHeader("Authorization"); + try { + Map claims = JwtUtil.parseToken(token); + return true; + } catch (Exception e) { + response.setStatus(401); + return false; + } + } +} diff --git a/RMS/src/main/java/com/demo/mapper/manage/ProcessRecordMapper.java b/RMS/src/main/java/com/demo/mapper/manage/ProcessRecordMapper.java new file mode 100644 index 0000000..342cb49 --- /dev/null +++ b/RMS/src/main/java/com/demo/mapper/manage/ProcessRecordMapper.java @@ -0,0 +1,9 @@ +package com.demo.mapper.manage; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.demo.pojo.manage.ProcessRecord; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ProcessRecordMapper extends BaseMapper { +} diff --git a/RMS/src/main/java/com/demo/mapper/setting/ProcessMapper.java b/RMS/src/main/java/com/demo/mapper/setting/ProcessMapper.java new file mode 100644 index 0000000..5283bdc --- /dev/null +++ b/RMS/src/main/java/com/demo/mapper/setting/ProcessMapper.java @@ -0,0 +1,9 @@ +package com.demo.mapper.setting; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.demo.pojo.setting.Process; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ProcessMapper extends BaseMapper { +} diff --git a/RMS/src/main/java/com/demo/mapper/setting/ProcessTemplateMapper.java b/RMS/src/main/java/com/demo/mapper/setting/ProcessTemplateMapper.java new file mode 100644 index 0000000..bc8baec --- /dev/null +++ b/RMS/src/main/java/com/demo/mapper/setting/ProcessTemplateMapper.java @@ -0,0 +1,9 @@ +package com.demo.mapper.setting; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.demo.pojo.setting.ProcessTemplate; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface ProcessTemplateMapper extends BaseMapper { +} diff --git a/RMS/src/main/java/com/demo/mapper/DeptMapper.java b/RMS/src/main/java/com/demo/mapper/system/DeptMapper.java similarity index 71% rename from RMS/src/main/java/com/demo/mapper/DeptMapper.java rename to RMS/src/main/java/com/demo/mapper/system/DeptMapper.java index 1adbc30..b7265c8 100644 --- a/RMS/src/main/java/com/demo/mapper/DeptMapper.java +++ b/RMS/src/main/java/com/demo/mapper/system/DeptMapper.java @@ -1,7 +1,8 @@ -package com.demo.mapper; +package com.demo.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.demo.pojo.PO.Dept; + +import com.demo.pojo.system.Dept; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/RMS/src/main/java/com/demo/mapper/system/LoginLogMapper.java b/RMS/src/main/java/com/demo/mapper/system/LoginLogMapper.java new file mode 100644 index 0000000..1d297f2 --- /dev/null +++ b/RMS/src/main/java/com/demo/mapper/system/LoginLogMapper.java @@ -0,0 +1,9 @@ +package com.demo.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.demo.pojo.system.LoginLog; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface LoginLogMapper extends BaseMapper { +} diff --git a/RMS/src/main/java/com/demo/mapper/MenuMapper.java b/RMS/src/main/java/com/demo/mapper/system/MenuMapper.java similarity index 86% rename from RMS/src/main/java/com/demo/mapper/MenuMapper.java rename to RMS/src/main/java/com/demo/mapper/system/MenuMapper.java index de3e88b..d058cd7 100644 --- a/RMS/src/main/java/com/demo/mapper/MenuMapper.java +++ b/RMS/src/main/java/com/demo/mapper/system/MenuMapper.java @@ -1,4 +1,4 @@ -package com.demo.mapper; +package com.demo.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.demo.pojo.PO.Menu; diff --git a/RMS/src/main/java/com/demo/mapper/system/OperLogMapper.java b/RMS/src/main/java/com/demo/mapper/system/OperLogMapper.java new file mode 100644 index 0000000..4dcca52 --- /dev/null +++ b/RMS/src/main/java/com/demo/mapper/system/OperLogMapper.java @@ -0,0 +1,10 @@ +package com.demo.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import com.demo.pojo.system.OperLog; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface OperLogMapper extends BaseMapper { +} diff --git a/RMS/src/main/java/com/demo/mapper/system/PostMapper.java b/RMS/src/main/java/com/demo/mapper/system/PostMapper.java new file mode 100644 index 0000000..537a671 --- /dev/null +++ b/RMS/src/main/java/com/demo/mapper/system/PostMapper.java @@ -0,0 +1,10 @@ +package com.demo.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import com.demo.pojo.system.Post; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface PostMapper extends BaseMapper { +} diff --git a/RMS/src/main/java/com/demo/mapper/system/RoleMapper.java b/RMS/src/main/java/com/demo/mapper/system/RoleMapper.java new file mode 100644 index 0000000..78954a6 --- /dev/null +++ b/RMS/src/main/java/com/demo/mapper/system/RoleMapper.java @@ -0,0 +1,10 @@ +package com.demo.mapper.system; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import com.demo.pojo.system.Role; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface RoleMapper extends BaseMapper { +} diff --git a/RMS/src/main/java/com/demo/mapper/UserMapper.java b/RMS/src/main/java/com/demo/mapper/system/UserMapper.java similarity index 79% rename from RMS/src/main/java/com/demo/mapper/UserMapper.java rename to RMS/src/main/java/com/demo/mapper/system/UserMapper.java index e478e9e..655ef15 100644 --- a/RMS/src/main/java/com/demo/mapper/UserMapper.java +++ b/RMS/src/main/java/com/demo/mapper/system/UserMapper.java @@ -1,13 +1,13 @@ -package com.demo.mapper; +package com.demo.mapper.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.demo.pojo.DTO.DTOUserDept; import com.demo.pojo.PO.User; import com.demo.pojo.DTO.DTOUserPost; import com.demo.pojo.DTO.DTOUserRole; -import com.demo.pojo.PO.UserRole; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -27,6 +27,8 @@ public interface UserMapper extends BaseMapper { public List selectDeptTree(String treePath); @Select("select * from sys_user where sys_user.dept_id in (#{user2})") public List selectUserList(String user2); - @Select("select * from sys_user_role left join sys_role on sys_user_role.role_id = sys_role.id where user_id = #{userId}") + @Select("select * from sys_user_role left join sys_role on sys_user_role.role_id = sys_role.id where user_id = #{userId} and sys_user_role.is_deleted = 1") public List selectUserRole(Integer userId); + @Update("update sys_user_role set role_id = #{roleId} where role_id = #{roleId} and user_id = #{userId} ") + public Integer updateRoleMenu(Integer roleId, Integer userId); } diff --git a/RMS/src/main/java/com/demo/mapper/wechat/WeMenuMapper.java b/RMS/src/main/java/com/demo/mapper/wechat/WeMenuMapper.java new file mode 100644 index 0000000..6125229 --- /dev/null +++ b/RMS/src/main/java/com/demo/mapper/wechat/WeMenuMapper.java @@ -0,0 +1,9 @@ +package com.demo.mapper.wechat; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.demo.pojo.wechat.WeMenu; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface WeMenuMapper extends BaseMapper { +} diff --git a/RMS/src/main/java/com/demo/pojo/PO/Process.java b/RMS/src/main/java/com/demo/pojo/PO/Process.java deleted file mode 100644 index 3f4768c..0000000 --- a/RMS/src/main/java/com/demo/pojo/PO/Process.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.demo.pojo.PO; - -import lombok.Data; - -import java.util.Date; -// 审批类 -@Data -public class Process { - private int id; - private String processCode; - private Integer userId; - private Integer processTemplateId; - private Integer processTypeId; - private String title; - private String description; - private String formValues; - private String processInstanceId; - private String currentAuditor; - private Integer status; - private Date createTime; - private Date updateTime; -} diff --git a/RMS/src/main/java/com/demo/pojo/R.java b/RMS/src/main/java/com/demo/pojo/R.java deleted file mode 100644 index 3de8942..0000000 --- a/RMS/src/main/java/com/demo/pojo/R.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.demo.pojo; - -public class R { - private Boolean flag; - private String msg; - private Object data; - - public R() { - } - - public R(Boolean flag, String msg, Object data) { - this.flag = flag; - this.msg = msg; - this.data = data; - } - - public Boolean getFlag() { - return flag; - } - - public void setFlag(Boolean flag) { - this.flag = flag; - } - - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public Object getData() { - return data; - } - - public void setData(Object data) { - this.data = data; - } -} diff --git a/RMS/src/main/java/com/demo/pojo/manage/ProcessRecord.java b/RMS/src/main/java/com/demo/pojo/manage/ProcessRecord.java new file mode 100644 index 0000000..a43aad7 --- /dev/null +++ b/RMS/src/main/java/com/demo/pojo/manage/ProcessRecord.java @@ -0,0 +1,24 @@ +package com.demo.pojo.manage; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName("oa_process_record") +public class ProcessRecord { + @TableId + private int id; + private String processId; + private String description; + private int status; + private int operateUserId; + private String operateUser; + private LocalDateTime createTime; +} diff --git a/RMS/src/main/java/com/demo/pojo/setting/Process.java b/RMS/src/main/java/com/demo/pojo/setting/Process.java new file mode 100644 index 0000000..e6f0175 --- /dev/null +++ b/RMS/src/main/java/com/demo/pojo/setting/Process.java @@ -0,0 +1,21 @@ +package com.demo.pojo.setting; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName("oa_process_type") +public class Process { + private Integer id; + private String name; + private String description; + private LocalDateTime createTime; + private LocalDateTime updateTime; + private int isDeleted; +} diff --git a/RMS/src/main/java/com/demo/pojo/setting/ProcessTemplate.java b/RMS/src/main/java/com/demo/pojo/setting/ProcessTemplate.java new file mode 100644 index 0000000..69d3705 --- /dev/null +++ b/RMS/src/main/java/com/demo/pojo/setting/ProcessTemplate.java @@ -0,0 +1,29 @@ +package com.demo.pojo.setting; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@AllArgsConstructor +@NoArgsConstructor +@Data +@TableName("oa_process_template") +public class ProcessTemplate { + private int id; + private String name; + private String iconUrl; + private String processTypeId; + private String formProps; + private String formOptions; + private String processDefinitionKey; + private String processDefinitionPath; + private String processModelId; + private String description; + private int status; + private LocalDateTime createTime; + private LocalDateTime updateTime; + private int isDeleted; +} diff --git a/RMS/src/main/java/com/demo/pojo/system/Dept.java b/RMS/src/main/java/com/demo/pojo/system/Dept.java new file mode 100644 index 0000000..d7b75aa --- /dev/null +++ b/RMS/src/main/java/com/demo/pojo/system/Dept.java @@ -0,0 +1,44 @@ +package com.demo.pojo.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.util.List; + +@AllArgsConstructor +@NoArgsConstructor +@Data +@TableName("sys_dept") +public class Dept { + private Integer id; + private String name; + private Integer parentId; + private String treePath; + private int sortValue; + private String leader; + private String phone; + private int status; + private LocalDateTime createTime; + private LocalDateTime updateTime; + private int isDeleted; + @TableField(exist = false) + private List children; + + public Dept(Integer id, String name, int parentId, String treePath, int sortValue, String leader, String phone, int status, LocalDateTime createTime, LocalDateTime updateTime, int isDeleted) { + this.id = id; + this.name = name; + this.parentId = parentId; + this.treePath = treePath; + this.sortValue = sortValue; + this.leader = leader; + this.phone = phone; + this.status = status; + this.createTime = createTime; + this.updateTime = updateTime; + this.isDeleted = isDeleted; + } +} diff --git a/RMS/src/main/java/com/demo/pojo/system/LoginLog.java b/RMS/src/main/java/com/demo/pojo/system/LoginLog.java new file mode 100644 index 0000000..dfbd1d2 --- /dev/null +++ b/RMS/src/main/java/com/demo/pojo/system/LoginLog.java @@ -0,0 +1,24 @@ +package com.demo.pojo.system; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@AllArgsConstructor +@NoArgsConstructor +@Data +@TableName("sys_login_log") +public class LoginLog { + private Integer id; + private String username; + private String ipaddr; + private int status; + private String msg; + private LocalDateTime accessTime; + private LocalDateTime createTime; + private LocalDateTime updateTime; + private int isDeleted; +} diff --git a/RMS/src/main/java/com/demo/pojo/system/Menu.java b/RMS/src/main/java/com/demo/pojo/system/Menu.java new file mode 100644 index 0000000..fdaa93f --- /dev/null +++ b/RMS/src/main/java/com/demo/pojo/system/Menu.java @@ -0,0 +1,46 @@ +package com.demo.pojo.system; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.util.List; + +@AllArgsConstructor +@NoArgsConstructor +@TableName("sys_menu") +@Data +public class Menu { + private int id; + private int parentId; + private String name; + private int type; + private String path; + private String component; + private String perms; + private String icon; + private int status; + private LocalDateTime create_time; + private LocalDateTime update_time; + private int isDeleted; + @TableField(exist = false) + private List children; + + public Menu(int id, int parentId, String name, int type, String path, String component, String perms, String icon, int status, LocalDateTime create_time, LocalDateTime update_time, int isDeleted) { + this.id = id; + this.parentId = parentId; + this.name = name; + this.type = type; + this.path = path; + this.component = component; + this.perms = perms; + this.icon = icon; + this.status = status; + this.create_time = create_time; + this.update_time = update_time; + this.isDeleted = isDeleted; + } +} diff --git a/RMS/src/main/java/com/demo/pojo/system/OperLog.java b/RMS/src/main/java/com/demo/pojo/system/OperLog.java new file mode 100644 index 0000000..0594524 --- /dev/null +++ b/RMS/src/main/java/com/demo/pojo/system/OperLog.java @@ -0,0 +1,33 @@ +package com.demo.pojo.system; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@AllArgsConstructor +@NoArgsConstructor +@Data +@TableName("sys_oper_log") +public class OperLog { + private int id; + private String title; + private String businessType; + private String method; + private String requestMethod; + private String operatorType; + private String operName; + private String deptName; + private String operUrl; + private String operIp; + private String operParam; + private String jsonResult; + private int status; + private String errorMsg; + private String operTime; + private LocalDateTime createTime; + private LocalDateTime updateTime; + private int isDeleted; +} diff --git a/RMS/src/main/java/com/demo/pojo/system/Post.java b/RMS/src/main/java/com/demo/pojo/system/Post.java new file mode 100644 index 0000000..7baa4cc --- /dev/null +++ b/RMS/src/main/java/com/demo/pojo/system/Post.java @@ -0,0 +1,23 @@ +package com.demo.pojo.system; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName("sys_post") +public class Post { + private int id; + private String postCode; + private String name; + private String description; + private int status; + private LocalDateTime createTime; + private LocalDateTime updateTime; + private int isDeleted; +} diff --git a/RMS/src/main/java/com/demo/pojo/system/Role.java b/RMS/src/main/java/com/demo/pojo/system/Role.java new file mode 100644 index 0000000..dd406a7 --- /dev/null +++ b/RMS/src/main/java/com/demo/pojo/system/Role.java @@ -0,0 +1,21 @@ +package com.demo.pojo.system; + + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName("sys_role") +public class Role { + private int id; + private String roleName; + private String roleCode; + private String description; + private String createTime; + private String updateTime; + private int isDeleted; +} diff --git a/RMS/src/main/java/com/demo/pojo/system/User.java b/RMS/src/main/java/com/demo/pojo/system/User.java new file mode 100644 index 0000000..35a86d6 --- /dev/null +++ b/RMS/src/main/java/com/demo/pojo/system/User.java @@ -0,0 +1,32 @@ +package com.demo.pojo.system; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +@Data +@TableName("sys_user") +@AllArgsConstructor +@NoArgsConstructor +public class User { + private int id; + private String username; + private String password; + private String name; + private String phone; + private String headUrl; + private int DeptId; + private int postId; + private String openId; + private String description; + private int status; + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private LocalDateTime updateTime; + private int isDeleted; +} diff --git a/RMS/src/main/java/com/demo/pojo/wechat/WeMenu.java b/RMS/src/main/java/com/demo/pojo/wechat/WeMenu.java new file mode 100644 index 0000000..4805328 --- /dev/null +++ b/RMS/src/main/java/com/demo/pojo/wechat/WeMenu.java @@ -0,0 +1,42 @@ +package com.demo.pojo.wechat; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@TableName("wechat_menu") +public class WeMenu { + private int id; + private int parentId; + private String name; + private String type; + private String url; + private String meunKey; + private int sort; + private LocalDateTime createTime; + private LocalDateTime updateTime; + private int isDeleted; + @TableField(exist = false) + private List children; + + public WeMenu(int id, int parentId, String name, String type, String url, String menuKey, int sort, LocalDateTime createTime, LocalDateTime updateTime, int isDeleted) { + this.id = id; + this.parentId = parentId; + this.name = name; + this.type = type; + this.url = url; + this.meunKey = menuKey; + this.sort = sort; + this.createTime = createTime; + this.updateTime = updateTime; + this.isDeleted = isDeleted; + } +} diff --git a/RMS/src/main/java/com/demo/service/manage/ProcessRecordService.java b/RMS/src/main/java/com/demo/service/manage/ProcessRecordService.java new file mode 100644 index 0000000..a6018f1 --- /dev/null +++ b/RMS/src/main/java/com/demo/service/manage/ProcessRecordService.java @@ -0,0 +1,8 @@ +package com.demo.service.manage; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.demo.pojo.manage.ProcessRecord; + + +public interface ProcessRecordService extends IService { +} diff --git a/RMS/src/main/java/com/demo/service/manage/impl/ProcessRecordServiceImpl.java b/RMS/src/main/java/com/demo/service/manage/impl/ProcessRecordServiceImpl.java new file mode 100644 index 0000000..095e144 --- /dev/null +++ b/RMS/src/main/java/com/demo/service/manage/impl/ProcessRecordServiceImpl.java @@ -0,0 +1,12 @@ +package com.demo.service.manage.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.demo.mapper.manage.ProcessRecordMapper; +import com.demo.pojo.manage.ProcessRecord; +import com.demo.service.manage.ProcessRecordService; +import org.springframework.stereotype.Service; + +@Service +public class ProcessRecordServiceImpl extends ServiceImpl implements ProcessRecordService { +} diff --git a/RMS/src/main/java/com/demo/service/setting/ProcessService.java b/RMS/src/main/java/com/demo/service/setting/ProcessService.java new file mode 100644 index 0000000..3c50d8b --- /dev/null +++ b/RMS/src/main/java/com/demo/service/setting/ProcessService.java @@ -0,0 +1,8 @@ +package com.demo.service.setting; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.demo.pojo.setting.Process; + + +public interface ProcessService extends IService { +} diff --git a/RMS/src/main/java/com/demo/service/setting/ProcessTemplateService.java b/RMS/src/main/java/com/demo/service/setting/ProcessTemplateService.java new file mode 100644 index 0000000..7ef66d1 --- /dev/null +++ b/RMS/src/main/java/com/demo/service/setting/ProcessTemplateService.java @@ -0,0 +1,8 @@ +package com.demo.service.setting; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.demo.pojo.setting.ProcessTemplate; + + +public interface ProcessTemplateService extends IService { +} diff --git a/RMS/src/main/java/com/demo/service/setting/impl/ProcessServiceImpl.java b/RMS/src/main/java/com/demo/service/setting/impl/ProcessServiceImpl.java new file mode 100644 index 0000000..224ae0d --- /dev/null +++ b/RMS/src/main/java/com/demo/service/setting/impl/ProcessServiceImpl.java @@ -0,0 +1,12 @@ +package com.demo.service.setting.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import com.demo.mapper.setting.ProcessMapper; +import com.demo.service.setting.ProcessService; +import org.springframework.stereotype.Service; +import com.demo.pojo.setting.Process; + +@Service +public class ProcessServiceImpl extends ServiceImpl implements ProcessService { +} diff --git a/RMS/src/main/java/com/demo/service/setting/impl/ProcessTemplateServiceImpl.java b/RMS/src/main/java/com/demo/service/setting/impl/ProcessTemplateServiceImpl.java new file mode 100644 index 0000000..87e9209 --- /dev/null +++ b/RMS/src/main/java/com/demo/service/setting/impl/ProcessTemplateServiceImpl.java @@ -0,0 +1,13 @@ +package com.demo.service.setting.impl; + + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.demo.mapper.setting.ProcessTemplateMapper; +import com.demo.pojo.setting.ProcessTemplate; +import com.demo.service.setting.ProcessTemplateService; +import org.springframework.stereotype.Service; + +@Service +public class ProcessTemplateServiceImpl extends ServiceImpl implements ProcessTemplateService { +} diff --git a/RMS/src/main/java/com/demo/service/system/DeptService.java b/RMS/src/main/java/com/demo/service/system/DeptService.java new file mode 100644 index 0000000..4827a19 --- /dev/null +++ b/RMS/src/main/java/com/demo/service/system/DeptService.java @@ -0,0 +1,8 @@ +package com.demo.service.system; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.demo.pojo.system.Dept; + + +public interface DeptService extends IService { +} diff --git a/RMS/src/main/java/com/demo/service/system/LoginLogService.java b/RMS/src/main/java/com/demo/service/system/LoginLogService.java new file mode 100644 index 0000000..289d2fc --- /dev/null +++ b/RMS/src/main/java/com/demo/service/system/LoginLogService.java @@ -0,0 +1,7 @@ +package com.demo.service.system; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.demo.pojo.system.LoginLog; + +public interface LoginLogService extends IService { +} diff --git a/RMS/src/main/java/com/demo/service/MenuService.java b/RMS/src/main/java/com/demo/service/system/MenuService.java similarity index 81% rename from RMS/src/main/java/com/demo/service/MenuService.java rename to RMS/src/main/java/com/demo/service/system/MenuService.java index 3230deb..23eb03b 100644 --- a/RMS/src/main/java/com/demo/service/MenuService.java +++ b/RMS/src/main/java/com/demo/service/system/MenuService.java @@ -1,4 +1,4 @@ -package com.demo.service; +package com.demo.service.system; import com.baomidou.mybatisplus.extension.service.IService; import com.demo.pojo.PO.Menu; diff --git a/RMS/src/main/java/com/demo/service/system/OperLogService.java b/RMS/src/main/java/com/demo/service/system/OperLogService.java new file mode 100644 index 0000000..c86b5df --- /dev/null +++ b/RMS/src/main/java/com/demo/service/system/OperLogService.java @@ -0,0 +1,7 @@ +package com.demo.service.system; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.demo.pojo.system.OperLog; + +public interface OperLogService extends IService { +} diff --git a/RMS/src/main/java/com/demo/service/system/PostService.java b/RMS/src/main/java/com/demo/service/system/PostService.java new file mode 100644 index 0000000..e2b9118 --- /dev/null +++ b/RMS/src/main/java/com/demo/service/system/PostService.java @@ -0,0 +1,7 @@ +package com.demo.service.system; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.demo.pojo.system.Post; + +public interface PostService extends IService { +} diff --git a/RMS/src/main/java/com/demo/service/system/RoleService.java b/RMS/src/main/java/com/demo/service/system/RoleService.java new file mode 100644 index 0000000..e428da5 --- /dev/null +++ b/RMS/src/main/java/com/demo/service/system/RoleService.java @@ -0,0 +1,8 @@ +package com.demo.service.system; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.demo.pojo.system.Role; + + +public interface RoleService extends IService { +} diff --git a/RMS/src/main/java/com/demo/service/UserService.java b/RMS/src/main/java/com/demo/service/system/UserService.java similarity index 81% rename from RMS/src/main/java/com/demo/service/UserService.java rename to RMS/src/main/java/com/demo/service/system/UserService.java index 20d34fe..7be3568 100644 --- a/RMS/src/main/java/com/demo/service/UserService.java +++ b/RMS/src/main/java/com/demo/service/system/UserService.java @@ -1,4 +1,4 @@ -package com.demo.service; +package com.demo.service.system; import com.baomidou.mybatisplus.extension.service.IService; import com.demo.pojo.PO.User; diff --git a/RMS/src/main/java/com/demo/service/system/impl/DeptServiceImpl.java b/RMS/src/main/java/com/demo/service/system/impl/DeptServiceImpl.java new file mode 100644 index 0000000..9269321 --- /dev/null +++ b/RMS/src/main/java/com/demo/service/system/impl/DeptServiceImpl.java @@ -0,0 +1,15 @@ +package com.demo.service.system.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.demo.mapper.system.DeptMapper; + + +import com.demo.pojo.system.Dept; +import com.demo.service.system.DeptService; +import org.springframework.stereotype.Service; + +@Service +public class DeptServiceImpl extends ServiceImpl implements DeptService { + +} diff --git a/RMS/src/main/java/com/demo/service/system/impl/LoginLogServiceImpl.java b/RMS/src/main/java/com/demo/service/system/impl/LoginLogServiceImpl.java new file mode 100644 index 0000000..fa4d589 --- /dev/null +++ b/RMS/src/main/java/com/demo/service/system/impl/LoginLogServiceImpl.java @@ -0,0 +1,12 @@ +package com.demo.service.system.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import com.demo.mapper.system.LoginLogMapper; +import com.demo.pojo.system.LoginLog; +import com.demo.service.system.LoginLogService; +import org.springframework.stereotype.Service; + +@Service +public class LoginLogServiceImpl extends ServiceImpl implements LoginLogService { +} diff --git a/RMS/src/main/java/com/demo/service/impl/MenuServiceImpl.java b/RMS/src/main/java/com/demo/service/system/impl/MenuServiceImpl.java similarity index 61% rename from RMS/src/main/java/com/demo/service/impl/MenuServiceImpl.java rename to RMS/src/main/java/com/demo/service/system/impl/MenuServiceImpl.java index 93a940a..ed6a5f7 100644 --- a/RMS/src/main/java/com/demo/service/impl/MenuServiceImpl.java +++ b/RMS/src/main/java/com/demo/service/system/impl/MenuServiceImpl.java @@ -1,9 +1,9 @@ -package com.demo.service.impl; +package com.demo.service.system.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.demo.mapper.MenuMapper; +import com.demo.mapper.system.MenuMapper; import com.demo.pojo.PO.Menu; -import com.demo.service.MenuService; +import com.demo.service.system.MenuService; public class MenuServiceImpl extends ServiceImpl implements MenuService { } diff --git a/RMS/src/main/java/com/demo/service/system/impl/OperLogServiceImpl.java b/RMS/src/main/java/com/demo/service/system/impl/OperLogServiceImpl.java new file mode 100644 index 0000000..379a612 --- /dev/null +++ b/RMS/src/main/java/com/demo/service/system/impl/OperLogServiceImpl.java @@ -0,0 +1,12 @@ +package com.demo.service.system.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import com.demo.mapper.system.OperLogMapper; +import com.demo.pojo.system.OperLog; +import com.demo.service.system.OperLogService; +import org.springframework.stereotype.Service; + +@Service +public class OperLogServiceImpl extends ServiceImpl implements OperLogService { +} diff --git a/RMS/src/main/java/com/demo/service/system/impl/PostServiceImpl.java b/RMS/src/main/java/com/demo/service/system/impl/PostServiceImpl.java new file mode 100644 index 0000000..8bec065 --- /dev/null +++ b/RMS/src/main/java/com/demo/service/system/impl/PostServiceImpl.java @@ -0,0 +1,12 @@ +package com.demo.service.system.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import com.demo.mapper.system.PostMapper; +import com.demo.pojo.system.Post; +import com.demo.service.system.PostService; +import org.springframework.stereotype.Service; + +@Service +public class PostServiceImpl extends ServiceImpl implements PostService { +} diff --git a/RMS/src/main/java/com/demo/service/system/impl/RoleServiceImpl.java b/RMS/src/main/java/com/demo/service/system/impl/RoleServiceImpl.java new file mode 100644 index 0000000..1159e0b --- /dev/null +++ b/RMS/src/main/java/com/demo/service/system/impl/RoleServiceImpl.java @@ -0,0 +1,12 @@ +package com.demo.service.system.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +import com.demo.mapper.system.RoleMapper; +import com.demo.pojo.system.Role; +import com.demo.service.system.RoleService; +import org.springframework.stereotype.Service; + +@Service +public class RoleServiceImpl extends ServiceImpl implements RoleService { +} diff --git a/RMS/src/main/java/com/demo/service/impl/UserServiceImpl.java b/RMS/src/main/java/com/demo/service/system/impl/UserServiceImpl.java similarity index 66% rename from RMS/src/main/java/com/demo/service/impl/UserServiceImpl.java rename to RMS/src/main/java/com/demo/service/system/impl/UserServiceImpl.java index afaf522..0b7342e 100644 --- a/RMS/src/main/java/com/demo/service/impl/UserServiceImpl.java +++ b/RMS/src/main/java/com/demo/service/system/impl/UserServiceImpl.java @@ -1,9 +1,9 @@ -package com.demo.service.impl; +package com.demo.service.system.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.demo.mapper.UserMapper; +import com.demo.mapper.system.UserMapper; import com.demo.pojo.PO.User; -import com.demo.service.UserService; +import com.demo.service.system.UserService; import org.springframework.stereotype.Service; @Service diff --git a/RMS/src/main/java/com/demo/service/wechat/WeMenuService.java b/RMS/src/main/java/com/demo/service/wechat/WeMenuService.java new file mode 100644 index 0000000..3e10e06 --- /dev/null +++ b/RMS/src/main/java/com/demo/service/wechat/WeMenuService.java @@ -0,0 +1,7 @@ +package com.demo.service.wechat; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.demo.pojo.wechat.WeMenu; + +public interface WeMenuService extends IService { +} diff --git a/RMS/src/main/java/com/demo/service/wechat/impl/WeMenuServiceImpl.java b/RMS/src/main/java/com/demo/service/wechat/impl/WeMenuServiceImpl.java new file mode 100644 index 0000000..07472b5 --- /dev/null +++ b/RMS/src/main/java/com/demo/service/wechat/impl/WeMenuServiceImpl.java @@ -0,0 +1,12 @@ +package com.demo.service.wechat.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.demo.mapper.wechat.WeMenuMapper; +import com.demo.pojo.wechat.WeMenu; +import com.demo.service.wechat.WeMenuService; +import org.springframework.stereotype.Service; + +@Service +public class WeMenuServiceImpl extends ServiceImpl implements WeMenuService { +} diff --git a/RMS/src/main/java/com/demo/tree/DeptTree.java b/RMS/src/main/java/com/demo/tree/DeptTree.java new file mode 100644 index 0000000..692d64a --- /dev/null +++ b/RMS/src/main/java/com/demo/tree/DeptTree.java @@ -0,0 +1,29 @@ +package com.demo.tree; + + + +import cn.hutool.core.collection.CollUtil; +import com.demo.pojo.system.Dept; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +public class DeptTree { + + public List createTree(List list, int parentId){ + List tree = list.stream().filter(e-> parentId == e.getParentId()).collect(Collectors.toList()); + for (Dept t: tree) { + Integer id = t.getId(); + List childList = list.stream().filter(e -> e.getParentId() == id).collect(Collectors.toList()); + if(CollUtil.isNotEmpty(childList)){ + createTree(list,id); + t.setChildren(childList); + }else{ + t.setChildren(Collections.emptyList()); + } + } + return tree; + } + +} diff --git a/RMS/src/main/java/com/demo/tree/MenuTree.java b/RMS/src/main/java/com/demo/tree/MenuTree.java new file mode 100644 index 0000000..092ef0f --- /dev/null +++ b/RMS/src/main/java/com/demo/tree/MenuTree.java @@ -0,0 +1,29 @@ +package com.demo.tree; + + + +import cn.hutool.core.collection.CollUtil; +import com.demo.pojo.system.Menu; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +public class MenuTree { + + public List createTree(List list, int parentId){ + List tree = list.stream().filter(e-> parentId == e.getParentId()).collect(Collectors.toList()); + for (Menu t: tree) { + Integer id = t.getId(); + List childList = list.stream().filter(e -> e.getParentId() == id).collect(Collectors.toList()); + if(CollUtil.isNotEmpty(childList)){ + createTree(list,id); + t.setChildren(childList); + }else{ + t.setChildren(Collections.emptyList()); + } + } + return tree; + } + +} diff --git a/RMS/src/main/java/com/demo/tree/WechatMenuTree.java b/RMS/src/main/java/com/demo/tree/WechatMenuTree.java new file mode 100644 index 0000000..dbefef1 --- /dev/null +++ b/RMS/src/main/java/com/demo/tree/WechatMenuTree.java @@ -0,0 +1,27 @@ +package com.demo.tree; + + +import cn.hutool.core.collection.CollUtil; +import com.demo.pojo.wechat.WeMenu; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +public class WechatMenuTree { + + public List createTree(List list, int parentId){ + List tree = list.stream().filter(e-> parentId == e.getParentId()).collect(Collectors.toList()); + for (WeMenu t: tree) { + Integer id = t.getId(); + List childList = list.stream().filter(e -> e.getParentId() == id).collect(Collectors.toList()); + if(CollUtil.isNotEmpty(childList)){ + createTree(list,id); + t.setChildren(childList); + }else{ + t.setChildren(Collections.emptyList()); + } + } + return tree; + } +} diff --git a/RMS/src/main/java/com/demo/util/JwtUtil.java b/RMS/src/main/java/com/demo/util/JwtUtil.java new file mode 100644 index 0000000..33f5baa --- /dev/null +++ b/RMS/src/main/java/com/demo/util/JwtUtil.java @@ -0,0 +1,30 @@ +package com.demo.util; + +import com.auth0.jwt.JWT; +import com.auth0.jwt.algorithms.Algorithm; + +import java.util.Date; +import java.util.Map; + +public class JwtUtil { + + private static final String KEY = "JQC"; + + //接收业务数据,生成token并返回 + public static String genToken(Map claims) { + return JWT.create() + .withClaim("claims", claims) + .withExpiresAt(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 12)) + .sign(Algorithm.HMAC256(KEY)); + } + + //接收token,验证token,并返回业务数据 + public static Map parseToken(String token) { + return JWT.require(Algorithm.HMAC256(KEY)) + .build() + .verify(token) + .getClaim("claims") + .asMap(); + } + +} diff --git a/RMS/src/main/java/com/demo/util/Md5Util.java b/RMS/src/main/java/com/demo/util/Md5Util.java new file mode 100644 index 0000000..c7d8898 --- /dev/null +++ b/RMS/src/main/java/com/demo/util/Md5Util.java @@ -0,0 +1,73 @@ +package com.demo.util; + + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +public class Md5Util { + /** + * 默认的密码字符串组合，用来将字节转换成 16 进制表示的字符,apache校验下载的文件的正确性用的就是默认的这个组合 + */ + protected static char hexDigits[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'}; + + protected static MessageDigest messagedigest = null; + + static { + try { + messagedigest = MessageDigest.getInstance("MD5"); + } catch (NoSuchAlgorithmException nsaex) { + System.err.println(Md5Util.class.getName() + "初始化失败，MessageDigest不支持MD5Util。"); + nsaex.printStackTrace(); + } + } + + /** + * 生成字符串的md5校验值 + * + * @param s + * @return + */ + public static String getMD5String(String s) { + return getMD5String(s.getBytes()); + } + + /** + * 判断字符串的md5校验码是否与一个已知的md5码相匹配 + * + * @param password 要校验的字符串 + * @param md5PwdStr 已知的md5校验码 + * @return + */ + public static boolean checkPassword(String password, String md5PwdStr) { + String s = getMD5String(password); + return s.equals(md5PwdStr); + } + + + public static String getMD5String(byte[] bytes) { + messagedigest.update(bytes); + return bufferToHex(messagedigest.digest()); + } + + private static String bufferToHex(byte bytes[]) { + return bufferToHex(bytes, 0, bytes.length); + } + + private static String bufferToHex(byte bytes[], int m, int n) { + StringBuffer stringbuffer = new StringBuffer(2 * n); + int k = m + n; + for (int l = m; l < k; l++) { + appendHexPair(bytes[l], stringbuffer); + } + return stringbuffer.toString(); + } + + private static void appendHexPair(byte bt, StringBuffer stringbuffer) { + char c0 = hexDigits[(bt & 0xf0) >> 4];// 取字节中高 4 位的数字转换, >>> + // 为逻辑右移，将符号位一起右移,此处未发现两种符号有何不同 + char c1 = hexDigits[bt & 0xf];// 取字节中低 4 位的数字转换 + stringbuffer.append(c0); + stringbuffer.append(c1); + } + +} diff --git a/RMS/src/main/java/com/demo/util/ThreadLocalUtil.java b/RMS/src/main/java/com/demo/util/ThreadLocalUtil.java new file mode 100644 index 0000000..661df1c --- /dev/null +++ b/RMS/src/main/java/com/demo/util/ThreadLocalUtil.java @@ -0,0 +1,26 @@ +package com.demo.util; + +/** + * ThreadLocal 工具类 + */ +@SuppressWarnings("all") +public class ThreadLocalUtil { + //提供ThreadLocal对象, + private static final ThreadLocal THREAD_LOCAL = new ThreadLocal(); + + //根据键获取值 + public static T get(){ + return (T) THREAD_LOCAL.get(); + } + + //存储键值对 + public static void set(Object value){ + THREAD_LOCAL.set(value); + } + + + //清除ThreadLocal 防止内存泄漏 + public static void remove(){ + THREAD_LOCAL.remove(); + } +} diff --git a/RMS/src/main/resources/com/demo/mapper/setting/ProcessMapper.xml b/RMS/src/main/resources/com/demo/mapper/setting/ProcessMapper.xml new file mode 100644 index 0000000..a5838e7 --- /dev/null +++ b/RMS/src/main/resources/com/demo/mapper/setting/ProcessMapper.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/RMS/src/test/java/com/demo/RmsApplicationTests.java b/RMS/src/test/java/com/demo/RmsApplicationTests.java index d92cdc4..91ead6c 100644 --- a/RMS/src/test/java/com/demo/RmsApplicationTests.java +++ b/RMS/src/test/java/com/demo/RmsApplicationTests.java @@ -1,13 +1,27 @@ package com.demo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.toolkit.Db; +import com.demo.pojo.setting.Process; +import com.demo.service.setting.ProcessService; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; @SpringBootTest class RmsApplicationTests { + @Autowired + private ProcessService processService; @Test void contextLoads() { +// IPage page1 = processService.lambdaQuery().page(new Page(1,3)); + IPage p = new Page(1,3); + IPage page = processService.page(p); + System.out.println(page); } } -- Gitee