diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/controller/RoleDifficultDeptController.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/controller/RoleDifficultDeptController.java index bfd4ede..0535d06 100644 --- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/controller/RoleDifficultDeptController.java +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/controller/RoleDifficultDeptController.java @@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.RoleDifficultDeptDTO; +import com.elink.esua.epdc.dto.RoleOverseeDeptRelationDTO; import com.elink.esua.epdc.modules.item.excel.RoleDifficultDeptExcel; import com.elink.esua.epdc.modules.item.service.RoleDifficultDeptService; import org.springframework.beans.factory.annotation.Autowired; @@ -91,4 +92,40 @@ public class RoleDifficultDeptController { ExcelUtils.exportExcelToTarget(response, null, list, RoleDifficultDeptExcel.class); } + /* + * @describe: 后台角色管理-关联角色和栏目 + * @author wangtong + * @date 2021/8/11 15:56 + * @params [realationDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("saveRoleOverseeRelation") + public Result saveRoleOverseeRelation(@RequestBody RoleOverseeDeptRelationDTO realationDto){ + return roleDifficultDeptService.saveRoleOverseeRelation(realationDto); + } + + /** + * @describe: 后台角色管理-更新角色督办部门关系 + * @author wangtong + * @date 2021/8/27 9:39 + * @params [realationDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PutMapping("updateRoleOverseeRelation") + public Result updateRoleOverseeRelation(@RequestBody RoleOverseeDeptRelationDTO realationDto){ + return roleDifficultDeptService.updateRoleOverseeRelation(realationDto); + } + + /** + * @describe: 后台角色管理-查询角色对应的督办部门权限 + * @author wangtong + * @date 2021/8/27 9:41 + * @params [roleId] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + */ + @GetMapping("getOverseeMenuIdList/{roleId}") + public Result> getOverseeMenuIdList(@PathVariable("roleId") Long roleId){ + return roleDifficultDeptService.getOverseeMenuIdList(roleId); + } + } \ No newline at end of file diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/dao/RoleDifficultDeptDao.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/dao/RoleDifficultDeptDao.java index e173455..8dca40a 100644 --- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/dao/RoleDifficultDeptDao.java +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/dao/RoleDifficultDeptDao.java @@ -20,6 +20,9 @@ package com.elink.esua.epdc.modules.item.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.modules.item.entity.RoleDifficultDeptEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 角色难点堵点部门关系表 @@ -29,5 +32,22 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface RoleDifficultDeptDao extends BaseDao { - + + /** + * @describe: 查询角色对应的督办部门权限 + * @author wangtong + * @date 2021/8/27 10:06 + * @params [roleId] + * @return java.util.List + */ + List getOverseeMenuIdList(@Param("roleId") Long roleId); + + /** + * @describe: 删除角色对应的督办部门权限 + * @author wangtong + * @date 2021/8/27 10:06 + * @params [roleId] + * @return void + */ + void deleteByRoleId(@Param("roleId") Long roleId); } \ No newline at end of file diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/RoleDifficultDeptService.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/RoleDifficultDeptService.java index c97423e..55c67aa 100644 --- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/RoleDifficultDeptService.java +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/RoleDifficultDeptService.java @@ -19,7 +19,9 @@ package com.elink.esua.epdc.modules.item.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.RoleDifficultDeptDTO; +import com.elink.esua.epdc.dto.RoleOverseeDeptRelationDTO; import com.elink.esua.epdc.modules.item.entity.RoleDifficultDeptEntity; import java.util.List; @@ -92,4 +94,31 @@ public interface RoleDifficultDeptService extends BaseService> + */ + Result> getOverseeMenuIdList(Long roleId); } \ No newline at end of file diff --git a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/impl/RoleDifficultDeptServiceImpl.java b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/impl/RoleDifficultDeptServiceImpl.java index 915daf7..95e8a3e 100644 --- a/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/impl/RoleDifficultDeptServiceImpl.java +++ b/epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/impl/RoleDifficultDeptServiceImpl.java @@ -23,7 +23,9 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.RoleDifficultDeptDTO; +import com.elink.esua.epdc.dto.RoleOverseeDeptRelationDTO; import com.elink.esua.epdc.modules.item.dao.RoleDifficultDeptDao; import com.elink.esua.epdc.modules.item.entity.RoleDifficultDeptEntity; import com.elink.esua.epdc.modules.item.redis.RoleDifficultDeptRedis; @@ -33,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -101,4 +104,32 @@ public class RoleDifficultDeptServiceImpl extends BaseServiceImpl entityList = new ArrayList<>(); + for(Long de : realationDto.getOverseeMenuIdList()){ + RoleDifficultDeptEntity entity = new RoleDifficultDeptEntity(); + entity.setRoleId(realationDto.getId()); + entity.setDeptId(de); + entityList.add(entity); + } + insertBatch(entityList); + return new Result().ok("插入成功"); + } + + @Transactional + @Override + public Result updateRoleOverseeRelation(RoleOverseeDeptRelationDTO realationDto) { + baseDao.deleteByRoleId(realationDto.getId()); + saveRoleOverseeRelation(realationDto); + return new Result().ok("更新成功"); + } + + @Override + public Result> getOverseeMenuIdList(Long roleId) { + List result = baseDao.getOverseeMenuIdList(roleId); + return new Result().ok(result); + } + } \ No newline at end of file diff --git a/epdc-cloud-events/src/main/resources/mapper/item/RoleDifficultDeptDao.xml b/epdc-cloud-events/src/main/resources/mapper/item/RoleDifficultDeptDao.xml index dc492af..71a75f3 100644 --- a/epdc-cloud-events/src/main/resources/mapper/item/RoleDifficultDeptDao.xml +++ b/epdc-cloud-events/src/main/resources/mapper/item/RoleDifficultDeptDao.xml @@ -14,6 +14,15 @@ + + + delete from epdc_role_difficult_dept + where ROLE_ID=#{roleId} + \ No newline at end of file