- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package com.epmet.service;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-/**
- * 多数据源测试
- *
- * @author Mark sunlightcs@gmail.com
- * @since 1.0.0
- */
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class DynamicDataSourceTest {
- @Autowired
- private DynamicDataSourceTestService dynamicDataSourceTestService;
-
- @Test
- public void test(){
- Long id = 1067246875800000001L;
- dynamicDataSourceTestService.selectById(id);
- dynamicDataSourceTestService.updateUser(id);
- dynamicDataSourceTestService.updateUserBySlave1(id);
- dynamicDataSourceTestService.updateUserBySlave2(id);
- }
-
-
-}
+///**
+// * Copyright 2018 人人开源 https://www.renren.io
+// *
+// * This program is free software: you can redistribute it and/or modify
+// * it under the terms of the GNU General Public License as published by
+// * the Free Software Foundation, either version 3 of the License, or
+// * (at your option) any later version.
+// *
+// * This program is distributed in the hope that it will be useful,
+// * but WITHOUT ANY WARRANTY; without even the implied warranty of
+// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// * GNU General Public License for more details.
+// *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.result.RoleAccessSettingResultDTO;
+import com.epmet.entity.RoleAccessSettingEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 权限配置
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-04-26
+ */
+@Mapper
+public interface RoleAccessSettingDao extends BaseDao {
+
+ List listRoleAccessSettingsByRoleId(String roleId);
+}
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleAccessSettingEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleAccessSettingEntity.java
new file mode 100644
index 0000000000..bbb8d650bf
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/RoleAccessSettingEntity.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 权限配置
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-04-26
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("role_access_setting")
+public class RoleAccessSettingEntity extends BaseEpmetEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 配置KEY
+ */
+ private String settingKey;
+
+ /**
+ * 配置name
+ */
+ private String settingName;
+ /**
+ * 配置值
+ */
+ private String settingValue;
+
+ /**
+ * 角色ID
+ */
+ private String roleId;
+
+ /**
+ * 操作简介
+ */
+ private String brief;
+
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/RoleAccessSettingRedis.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/RoleAccessSettingRedis.java
new file mode 100644
index 0000000000..02efbb9850
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/RoleAccessSettingRedis.java
@@ -0,0 +1,37 @@
+package com.epmet.redis;
+
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.dto.result.RoleAccessSettingResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiConsumer;
+
+@Component
+public class RoleAccessSettingRedis {
+
+ @Autowired
+ private RedisUtils redisUtils;
+
+ public void set(Map settings, String roleId) {
+ String roleAccessSettingKey = RedisKeys.getRoleAccessSettingKey(roleId);
+ redisUtils.hMSet(roleAccessSettingKey, settings);
+ }
+
+ public Map get(String roleId) {
+ String roleAccessSettingKey = RedisKeys.getRoleAccessSettingKey(roleId);
+ Map s = redisUtils.hGetAll(roleAccessSettingKey);
+ Map settings = new HashMap<>();
+ s.forEach((s1, o) -> {
+ if (o != null) {
+ settings.put(s1, String.valueOf(o));
+ }
+ });
+ return settings;
+ }
+
+}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessService.java
index df16e1e9df..dcda2ebe7e 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessService.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/AccessService.java
@@ -1,10 +1,12 @@
package com.epmet.service;
import com.epmet.commons.tools.security.dto.GovTokenDto;
+import com.epmet.dto.result.RoleAccessSettingResultDTO;
import com.epmet.dto.result.RoleOpeScopeResultDTO;
import com.epmet.entity.OperationScopeEntity;
import java.util.List;
+import java.util.Map;
import java.util.Set;
public interface AccessService {
@@ -13,7 +15,7 @@ public interface AccessService {
* @param staffId
* @param permissions
*/
- void updatePermissionCache(String staffId, String app, String client, Set permissions, Set roleIdList, String orgIdPath);
+ void updatePermissionCache(String staffId, String app, String client, Set permissions, Set roleIdList, String orgIdPath, String gridId);
/**
* 查询用户当前权限列表
@@ -28,4 +30,11 @@ public interface AccessService {
* @return
*/
Set listOperationScopesByRoleId(String roleId, String operationKey);
+
+ /**
+ * 查询角色的权限相关配置
+ * @param roleId
+ * @return
+ */
+ Map listAccessSettings(String roleId);
}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
index 34e458ec6a..0249885536 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
+++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
@@ -4,7 +4,10 @@ import com.epmet.commons.tools.exception.ExceptionUtils;
import com.epmet.commons.tools.security.dto.GovTokenDto;
import com.epmet.commons.tools.utils.CpUserDetailRedis;
import com.epmet.dao.OperationScopeDao;
+import com.epmet.dao.RoleAccessSettingDao;
+import com.epmet.dto.result.RoleAccessSettingResultDTO;
import com.epmet.dto.result.RoleOpeScopeResultDTO;
+import com.epmet.redis.RoleAccessSettingRedis;
import com.epmet.redis.RoleOpeScopeRedis;
import com.epmet.service.AccessService;
import org.slf4j.Logger;
@@ -13,7 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.Set;
+import java.util.*;
@Service
public class AccessServiceImpl implements AccessService {
@@ -26,16 +29,24 @@ public class AccessServiceImpl implements AccessService {
@Autowired
private OperationScopeDao operationScopeDao;
+ @Autowired
+ private RoleAccessSettingDao roleAccessSettingDao;
+
@Autowired
private RoleOpeScopeRedis roleOpeScopeRedis;
+ @Autowired
+ private RoleAccessSettingRedis roleAccessSettingRedis;
+
+
/**
* 更新权限缓存
* @param staffId
* @param permissions
*/
@Override
- public void updatePermissionCache(String staffId, String app, String client, Set permissions, Set roleIdList, String orgIdPath) {
+ public void updatePermissionCache(String staffId, String app, String client, Set permissions, Set roleIdList,
+ String orgIdPath, String gridId) {
GovTokenDto govTokenDto = cpUserDetailRedis.get(app, client, staffId, GovTokenDto.class);
if (govTokenDto == null) {
logger.warn("更新[{}]用户缓存:Redis中不存在该用户TokenDto缓存信息", staffId);
@@ -45,6 +56,7 @@ public class AccessServiceImpl implements AccessService {
govTokenDto.setPermissions(permissions);
govTokenDto.setRoleIdList(roleIdList);
govTokenDto.setOrgIdPath(orgIdPath);
+ govTokenDto.setGridId(gridId);
// 将新的TokenDto更新到redis中
long expire = cpUserDetailRedis.getExpire(app, client, staffId);
@@ -77,4 +89,26 @@ public class AccessServiceImpl implements AccessService {
}
return scopes;
}
+
+ /**
+ * 查询角色的权限相关配置
+ * @param roleId
+ * @return
+ */
+ @Override
+ public Map listAccessSettings(String roleId) {
+ Map settings = roleAccessSettingRedis.get(roleId);
+ //if (CollectionUtils.isEmpty(settings)) {
+ // // 数据库查出来，放入redis一份。此处为权限过滤器用到，存在缓存穿透，所以不采用这种方式。
+ // // 改用为：变动setting的时候手动更新缓存的方式
+ // List settingsDB = roleAccessSettingDao.listRoleAccessSettingsByRoleId(roleId);
+ // if (!CollectionUtils.isEmpty(settingsDB)) {
+ // roleAccessSettingRedis.set(settingsDB, roleId);
+ // }
+ //}
+ if (settings == null) {
+ settings = new HashMap<>();
+ }
+ return settings;
+ }
}
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql
index 93d8c2a148..62e72134a0 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/db.migration/epmet_gov_access.sql
@@ -5,6 +5,8 @@
-- SET NAMES utf8mb4;
-- #SET FOREIGN_KEY_CHECKS = 0;
+CREATE DATABASE `epmet_gov_access` DEFAULT CHARACTER SET utf8mb4;
+
-- DROP TABLE IF EXISTS `permission_scope`;
CREATE TABLE `operation_scope` (
`ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'id',
@@ -73,4 +75,22 @@ CREATE TABLE `role_scope` (
PRIMARY KEY (`ID`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色能操作哪些范围' ROW_FORMAT = Dynamic;
+-- 2020.04.26 wxz --
+
+CREATE TABLE `role_access_setting` (
+ `ID` varchar(64) NOT NULL COMMENT '主键',
+ `SETTING_KEY` varchar(30) NOT NULL COMMENT '配置KEY',
+ `SETTING_NAME` varchar(30) NOT NULL COMMENT '配置name',
+ `SETTING_VALUE` varchar(30) NOT NULL COMMENT '配置值',
+ `ROLE_ID` varchar(64) DEFAULT NULL COMMENT '角色ID',
+ `BRIEF` varchar(255) DEFAULT NULL COMMENT '操作简介',
+ `DEL_FLAG` tinyint(1) DEFAULT NULL,
+ `REVISION` int(10) DEFAULT NULL,
+ `CREATED_BY` varchar(64) DEFAULT NULL,
+ `CREATED_TIME` datetime DEFAULT NULL,
+ `UPDATED_BY` varchar(64) DEFAULT NULL,
+ `UPDATED_TIME` datetime DEFAULT NULL,
+ PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='权限配置'
+
-- SET FOREIGN_KEY_CHECKS = 1;
diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleAccessSettingDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleAccessSettingDao.xml
new file mode 100644
index 0000000000..cc31938799
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/RoleAccessSettingDao.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/gov-access/gov-access-server/src/test/java/com/epmet/test/govaccess/AccessSettingTest.java b/epmet-module/gov-access/gov-access-server/src/test/java/com/epmet/test/govaccess/AccessSettingTest.java
new file mode 100644
index 0000000000..6ac8bf1547
--- /dev/null
+++ b/epmet-module/gov-access/gov-access-server/src/test/java/com/epmet/test/govaccess/AccessSettingTest.java
@@ -0,0 +1,38 @@
+package com.epmet.test.govaccess;
+
+import com.epmet.dao.RoleAccessSettingDao;
+import com.epmet.dto.result.RoleAccessSettingResultDTO;
+import com.epmet.redis.RoleAccessSettingRedis;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class AccessSettingTest {
+
+ @Autowired
+ private RoleAccessSettingDao roleAccessSettingDao;
+
+ @Autowired
+ private RoleAccessSettingRedis roleAccessSettingRedis;
+
+ @Test
+ public void addAccessSettings2Redis() {
+ List settings = roleAccessSettingDao.listRoleAccessSettingsByRoleId("1");
+ HashMap objectObjectHashMap = new HashMap<>();
+ settings.forEach(s -> {
+ objectObjectHashMap.put(s.getSettingKey(), s.getSettingValue());
+ });
+ roleAccessSettingRedis.set(objectObjectHashMap, "1");
+ Map map = roleAccessSettingRedis.get("1");
+ System.out.println(map);
+ }
+
+}
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index 287da51fec..eaabe43f49 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -23,6 +23,7 @@ import java.util.List;
* @Description
* @Author sun
*/
+//, url = "localhost:8087"
@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class)
public interface EpmetUserFeignClient {
/**
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index 8c03d28764..45f0647c4b 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -19,6 +19,7 @@ import java.util.List;
* @Description
* @Author sun
*/
+//, url = "localhost:8092"
@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
public interface GovOrgFeignClient {
diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
index d76e2e2f34..13340d53e1 100644
--- a/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
+++ b/epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/AccessServiceImpl.java
@@ -38,27 +38,25 @@ public class AccessServiceImpl implements AccessService {
@Autowired
private GovOrgFeignClient govOrgFeignClient;
- @Autowired
- private CpUserDetailRedis cpUserDetailRedis;
-
- @Override
- public Set listOpeKeysByStaffId(String app, String client, String staffId, String agencyId, String gridId) {
+ public List queryGovStaffRoles(String staffId, String orgId) {
List roleDTOS = new ArrayList<>();
- // 查询机关单位权限
StaffRoleFormDTO formDTO = new StaffRoleFormDTO();
formDTO.setStaffId(staffId);
- formDTO.setOrgId(agencyId);
- Result> agencyResult = userFeignClient.getRolesOfStaff(formDTO);
- if (!CollectionUtils.isEmpty(agencyResult.getData())) {
- roleDTOS.addAll(agencyResult.getData());
- }
- // 查询网格权限
- formDTO.setStaffId(staffId);
- formDTO.setOrgId(gridId);
+ formDTO.setOrgId(orgId);
Result> gridResult = userFeignClient.getRolesOfStaff(formDTO);
if (!CollectionUtils.isEmpty(gridResult.getData())) {
roleDTOS.addAll(gridResult.getData());
}
+ return roleDTOS;
+ }
+
+ @Override
+ public Set listOpeKeysByStaffId(String app, String client, String staffId, String agencyId, String gridId) {
+ List roleDTOS = new ArrayList<>();
+ // 查询机关单位中的角色
+ roleDTOS.addAll(queryGovStaffRoles(staffId, agencyId));
+ // 查询网格中的角色
+ roleDTOS.addAll(queryGovStaffRoles(staffId, gridId));
// 拼装操作key列表
Set opeKeys = new HashSet<>();
@@ -86,7 +84,7 @@ public class AccessServiceImpl implements AccessService {
// 查询该直属机关的orgIdPath
Result agencyById = govOrgFeignClient.getAgencyById(agencyId);
- if (agencyById.getCode() != 0 || agencyById.getData() == null) {
+ if (!agencyById.success() || agencyById.getData() == null) {
logger.error("根据当前机构id[{}]查询pids失败:{}", agencyId, agencyById.getMsg());
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
}
@@ -98,6 +96,7 @@ public class AccessServiceImpl implements AccessService {
staffPermCacheFormDTO.setStaffId(staffId);
staffPermCacheFormDTO.setPermissions(opeKeys);
staffPermCacheFormDTO.setRoleIdList(roleIds);
+ staffPermCacheFormDTO.setGridId(gridId);
// 拼接orgIdPath
staffPermCacheFormDTO.setOrgIdPath(String.format("%s:%s", agencyById.getData().getPids(), agencyId));
govAccessFeignClient.updatePermissionCache(staffPermCacheFormDTO);
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
index b55e48a3e0..c94a102685 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
@@ -11,10 +11,7 @@ import com.epmet.dto.result.DepartmentInAgencyResultDTO;
import com.epmet.dto.result.DepartmentListResultDTO;
import com.epmet.service.DepartmentService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -112,4 +109,14 @@ public class DepartmentController {
ValidatorUtils.validateEntity(formDTO);
return departmentService.departmentList(formDTO);
}
+
+ /**
+ * 根据StaffId查询所属部门列表
+ * @return
+ */
+ @PostMapping("staff/{staffId}/departmentlist")
+ public Result> getDepartmentListByStaffId(@PathVariable("staffId") String staffId) {
+ List deptList = departmentService.listDepartmentListByStaffId(staffId);
+ return new Result>().ok(deptList);
+ }
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
index b7569a1396..5ecfdff97f 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java
@@ -49,4 +49,11 @@ public interface CustomerDepartmentDao extends BaseDao
* @Description 根据当前机关Id查询该机关下的直属部门列表
**/
List selectDepartmentList(@Param("agencyId") String agencyId);
+
+ /**
+ * 根据StaffId查询所属部门列表
+ * @param staffId
+ * @return
+ */
+ List listDepartmentListByStaffId(@Param("staffId") String staffId);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java
index 2d49860de2..495a285f66 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java
@@ -86,4 +86,11 @@ public interface DepartmentService {
* @return
*/
Result addDepartmentStaff(TokenDto tokenDto,AddDepartmentStaffFormDTO addDepartmentStaffFormDTO);
+
+ /**
+ * 根据StaffId查询所属部门列表
+ * @param staffId
+ * @return
+ */
+ List listDepartmentListByStaffId(String staffId);
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java
index dda0d02ae7..2df01f8d3a 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java
@@ -226,4 +226,9 @@ public class DepartmentServiceImpl implements DepartmentService {
customerStaffDepartmentDao.updateDepartmentStaffCount(data.size(),addDepartmentStaffFormDTO.getDepartmentId());
return new Result();
}
+
+ @Override
+ public List listDepartmentListByStaffId(String staffId) {
+ return customerDepartmentDao.listDepartmentListByStaffId(staffId);
+ }
}
\ No newline at end of file
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
index 932f7f66d3..e440745e06 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml
@@ -26,4 +26,11 @@
ORDER BY created_time DESC
+
+
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
index 6d65865681..32ec353dfe 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/StaffRoleDao.java
@@ -18,11 +18,13 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.commons.mybatis.entity.DataScope;
import com.epmet.dto.StaffRoleDTO;
import com.epmet.dto.result.GovStaffRoleResultDTO;
import com.epmet.entity.StaffRoleEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import org.springframework.context.annotation.Scope;
import java.util.List;
@@ -40,7 +42,8 @@ public interface StaffRoleDao extends BaseDao {
* @param orgId
* @return
*/
- List listStaffIdsByRoleKeyAndOrgId(@Param("roleKey") String roleKey, @Param("orgId") String orgId);
+ List listStaffIdsByRoleKeyAndOrgId(@Param("roleKey") String roleKey, @Param("orgId") String orgId,
+ @Param("dataScope") DataScope dataScope);
/**
* 删除工作人员权限
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index acbb5833f7..1f518e6910 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.PostMapping;
* @Author sun
* @Date 2020/3/16
*/
+//, url = "localhost:8092"
@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
public interface GovOrgFeignClient {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
index 180521ebe3..80e16582d8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java
@@ -111,9 +111,9 @@ public class StaffRoleServiceImpl extends BaseServiceImpl listStaffsInRole(String roleKey, String orgId, DataScope dataScope) {
- return baseDao.listStaffIdsByRoleKeyAndOrgId(roleKey, orgId);
+ return baseDao.listStaffIdsByRoleKeyAndOrgId(roleKey, orgId, dataScope);
}
@Override