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/dao/TsResourceDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java index 335a7986..de959ae0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarResource.dao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; import java.util.List; /** @@ -19,4 +20,6 @@ public interface TsResourceDao extends BaseMapper { List selectMenuByRole(TsResource sarMenuEO); + int insertTsRoleResource(HashMap map); + } 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 e4536ea8..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 @@ -4,6 +4,7 @@ import com.adc.da.slrs.sarRole.entity.TsRole; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -75,7 +76,7 @@ public interface TsRoleDao extends BaseMapper { * @param resourceId:权限ID */ @Insert("insert into ts_role_resource (role_id,resource_id) values (#{roleId},#{resourceId})") - void addResource(String roleId, String resourceId); + void addResource(@Param("roleId") String roleId, @Param("resourceId") String resourceId); /** * 删除权限 @@ -83,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(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index 93aa8d45..290c2343 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -17,7 +17,7 @@ import java.util.Map; */ public interface ISarStandardsInfoService extends IService { - void reverseQueryStand(List ids, String standName,String type); +// void reverseQueryStand(List ids, String standName,String type); List getSarStandardsInfoPage(SarStandardsInfoEOPage page) throws Exception; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 63b78fb7..500854cf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -194,59 +194,59 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl ids, String standName,String type){ - String fieldInfo = InitStandAttrUtil.queryField; - if (StringUtils.isNotBlank(fieldInfo) && StringUtils.isNotBlank(type)) { - List> getAttrListMap = sarStandAttrInfoEODao.selectStandFieldAndDataListMap(fieldInfo, ids); - getAttrListMap.forEach(attrMap -> { - List list = Collections.singletonList(attrMap.get(type).toString()); - list.add(standName); - String reverseStandName = list.stream().map(String::toString).collect(Collectors.joining(",")); - attrMap.put(type,reverseStandName); - SarStandAttrInfo sarStandAttrInfo = map2Object(attrMap,SarStandAttrInfo.class); - sarStandAttrInfoEODao.updateById(sarStandAttrInfo); - }); - } - } - - public static T map2Object(Map map, Class clazz) { - - T obj = null; - try { - BeanInfo bean = Introspector.getBeanInfo(clazz); - PropertyDescriptor[] propertyDescriptorArr = bean.getPropertyDescriptors(); - for (int i = 0; i < propertyDescriptorArr.length; i++) { - PropertyDescriptor propertyDescriptor = propertyDescriptorArr[i]; - String name = propertyDescriptor.getName(); - if(map.containsKey(name)) { - Object value = map.get(name); - if("null".equals(value)) { - value = null; - } - Object[] objArr = new Object[0]; - objArr[0] = value; - try { - propertyDescriptor.getWriteMethod().invoke(obj, objArr); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } - } - - } - } catch (IntrospectionException e) { - e.printStackTrace(); - } - return obj; - } +// /** +// * 反向操作标准 +// */ +// @Override +// @Async +// public void reverseQueryStand(List ids, String standName,String type){ +// String fieldInfo = InitStandAttrUtil.queryField; +// if (StringUtils.isNotBlank(fieldInfo) && StringUtils.isNotBlank(type)) { +// List> getAttrListMap = sarStandAttrInfoEODao.selectStandFieldAndDataListMap(fieldInfo, ids); +// getAttrListMap.forEach(attrMap -> { +// List list = Collections.singletonList(attrMap.get(type).toString()); +// list.add(standName); +// String reverseStandName = list.stream().map(String::toString).collect(Collectors.joining(",")); +// attrMap.put(type,reverseStandName); +// SarStandAttrInfo sarStandAttrInfo = map2Object(attrMap,SarStandAttrInfo.class); +// sarStandAttrInfoEODao.updateById(sarStandAttrInfo); +// }); +// } +// } +// +// public static T map2Object(Map map, Class clazz) { +// +// T obj = null; +// try { +// BeanInfo bean = Introspector.getBeanInfo(clazz); +// PropertyDescriptor[] propertyDescriptorArr = bean.getPropertyDescriptors(); +// for (int i = 0; i < propertyDescriptorArr.length; i++) { +// PropertyDescriptor propertyDescriptor = propertyDescriptorArr[i]; +// String name = propertyDescriptor.getName(); +// if(map.containsKey(name)) { +// Object value = map.get(name); +// if("null".equals(value)) { +// value = null; +// } +// Object[] objArr = new Object[0]; +// objArr[0] = value; +// try { +// propertyDescriptor.getWriteMethod().invoke(obj, objArr); +// } catch (IllegalAccessException e) { +// e.printStackTrace(); +// } catch (IllegalArgumentException e) { +// e.printStackTrace(); +// } catch (InvocationTargetException e) { +// e.printStackTrace(); +// } +// } +// +// } +// } catch (IntrospectionException e) { +// e.printStackTrace(); +// } +// return obj; +// } /***