From 26547db4b36f8204ddf6250f84a32fd4a7a02bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Mon, 13 Apr 2020 14:50:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-admin/epdc-admin-server/pom.xml | 8 ++++---- .../esua/epdc/controller/SysUserController.java | 6 ++++++ .../com/elink/esua/epdc/dao/SysRoleUserDao.java | 2 ++ .../esua/epdc/service/SysRoleUserService.java | 6 ++++++ .../epdc/service/impl/SysRoleUserServiceImpl.java | 5 +++++ .../src/main/resources/application-test.yml | 6 +++--- .../src/main/resources/application.yml | 1 + .../src/main/resources/mapper/SysRoleUserDao.xml | 14 +++++++++++++- 8 files changed, 40 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 25640901b..5418ca548 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -143,7 +143,7 @@ false 47.104.224.45:8848 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + a746dde3-7a13-4521-b986-7369b0b7c269 http://localhost:9411 @@ -164,15 +164,15 @@ test - 10001 + 10021 test test true 47.104.224.45:8848 - 47.104.85.99 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + 219.146.91.110 + a746dde3-7a13-4521-b986-7369b0b7c269 http://localhost:9411 diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index aa5e46fbe..8d3cfb4f1 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java @@ -231,6 +231,12 @@ public class SysUserController { return new Result>().ok(data); } + @GetMapping("getWorkRecordRoleUser/{menuCode}") + public Result> getWorkRecordRoleUser(@PathVariable("menuCode") String menuCode) { + List data = sysRoleUserService.getWorkRecordRoleUser(menuCode); + + return new Result>().ok(data); + } /** * 根据用户名更新用户微信openId diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleUserDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleUserDao.java index 87a648e78..32f149d03 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleUserDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysRoleUserDao.java @@ -43,4 +43,6 @@ public interface SysRoleUserDao extends BaseDao { * @return */ List getRoleIdList(Long userId); + + List getWorkRecordRoleUser(String menuCode); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleUserService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleUserService.java index 05b6d0efc..50ebae918 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleUserService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysRoleUserService.java @@ -46,4 +46,10 @@ public interface SysRoleUserService extends BaseService { * @param userId 用户ID */ List getRoleIdList(Long userId); + + /** + * 用户ID列表 + * @param menuCode 用户ID + */ + List getWorkRecordRoleUser(String menuCode); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleUserServiceImpl.java index 2af031418..58b5492a0 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleUserServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleUserServiceImpl.java @@ -62,4 +62,9 @@ public class SysRoleUserServiceImpl extends BaseServiceImpl getWorkRecordRoleUser(String menuCode) { + + return baseDao.getWorkRecordRoleUser(menuCode); + } } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml index f35566981..f47bc0a4b 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-test.yml @@ -1,10 +1,10 @@ spring: redis: database: 2 - host: 47.104.224.45 + host: 114.215.125.123 timeout: 30s - port: 6379 - password: elink@888 + port: 9603 + password: epdc!redis@master1405 datasource: druid: driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml index ce4d434b1..91563710a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application.yml @@ -23,6 +23,7 @@ spring: server-addr: @nacos.server-addr@ register-enabled: @nacos.register-enabled@ ip: @nacos.ip@ + namespace: @nacos.namespace@ alibaba: seata: tx-service-group: epdc-admin-server-fescar-service-group diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleUserDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleUserDao.xml index 003716fa7..ba0b49124 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleUserDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysRoleUserDao.xml @@ -17,5 +17,17 @@ - +