diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java index 3079dc44..7ab32bdc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java @@ -53,6 +53,13 @@ public class TsResourceController extends BaseController { return Result.success(tsResources); } +// @ApiOperation("查询所有资源") +// @GetMapping("/getDefault") +// public ResponseMessage> getDefault(){ +// List tsResources=tsResourceService.getDefaultByName(); +// return Result.success(tsResources); +// } + @ApiOperation("添加资源") @PostMapping("/add") public ResponseMessage addResource(@RequestBody TsResource tsResource){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java index e66ec54c..2335e30e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java @@ -34,6 +34,8 @@ public interface ITsResourceService extends IService { List getAll(TsResource tsResource); + List getDefaultByName(); + ResponseMessage addResource(TsResource tsResource); ResponseMessage updateResource(TsResource tsResource); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index c3f3a777..5da4ba92 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -155,6 +155,19 @@ public class TsResourceServiceImpl extends ServiceImpl getDefaultByName() { + List menusNames=new ArrayList<>(); + menusNames.add("海外标准法规"); + menusNames.add("国内标准法规"); + QueryWrapper tsResourceQueryWrapper=new QueryWrapper<>(); + tsResourceQueryWrapper.in("MENU_NAME",menusNames); + List TsResources=dao.selectList(tsResourceQueryWrapper); + List res=new ArrayList<>(); + TsResources.forEach(tsResource -> res.add(tsResource.getId())); + return res; + } + /** * 添加菜单 * @param TsResource:菜单信息 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index eba62f9b..afcda9b0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -6,6 +6,8 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.sarMenu.entity.SarMenu; +import com.adc.da.slrs.sarResource.entity.TsResource; +import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO; import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.adc.da.slrs.sarRole.service.ITsRoleService; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java index c703d089..545ff443 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java @@ -84,7 +84,7 @@ public interface TsRoleDao extends BaseMapper { * @param resourceId:权限ID */ @Delete("delete from ts_role_resource where role_id=#{roleId} and resource_id=#{resourceId}") - void delResource(String roleId, String resourceId); + void delResource(@Param("roleId") String roleId,@Param("resourceId") String resourceId); /** * 通过角色Id列表查询资源Id列表 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index d8ed1875..e4ee3dac 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -6,6 +6,7 @@ import com.adc.da.slrs.sarMenu.dao.SarMenuDao; import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarMenu.service.ISarMenuService; import com.adc.da.slrs.sarPersonalCenter.service.ISarUserPersonalMenuService; +import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarRole.entity.TsRole; import com.adc.da.slrs.sarRole.dao.TsRoleDao; import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO; @@ -42,6 +43,9 @@ public class TsRoleServiceImpl extends ServiceImpl implements @Autowired @Lazy private ISarUserPersonalMenuService sarUserPersonalMenuService; + + @Autowired + private ITsResourceService tsResourceService; /** * 查询所有角色 * @return List @@ -105,6 +109,10 @@ public class TsRoleServiceImpl extends ServiceImpl implements tsRole.setRoleHierarchy(parentRole.getRoleHierarchy()+1); } tsRoleDao.insert(tsRole); + List as=tsResourceService.getDefaultByName(); + as.forEach(s -> { + tsRoleDao.addResource(tsRole.getId(),s); + }); return Result.success(); }