From 589b31aa4de8958f3baef895cd28a013b57220c8 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 30 Jul 2021 09:32:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B3=A8=E6=8E=89=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=B6=85=E5=93=A5=E4=BB=A3=E7=A0=81=20=E4=BD=BF=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=85=88=E8=B7=91=E8=B5=B7=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 10 +- .../service/ISarStandardsInfoService.java | 2 +- .../impl/SarStandardsInfoServiceImpl.java | 106 +++++++++--------- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index 5e5a1324..7bb2641a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -77,11 +77,11 @@ public class SarStandardsInfoController extends BaseController @Autowired ISarLawsInfoService sarLawsInfoEOService; - @ApiOperation(value="SarStandardsInfoEO|反向标准操作") - @GetMapping(value = "/reverseQueryStand") - public void reverseQueryStand(@RequestParam(name="ids",required=true) String ids, String standName, String type) { - this.sarStandardsInfoEOService.reverseQueryStand(Arrays.asList(ids.split(",")),standName,type); - } +// @ApiOperation(value="SarStandardsInfoEO|反向标准操作") +// @GetMapping(value = "/reverseQueryStand") +// public void reverseQueryStand(@RequestParam(name="ids",required=true) String ids, String standName, String type) { +// this.sarStandardsInfoEOService.reverseQueryStand(Arrays.asList(ids.split(",")),standName,type); +// } @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") @GetMapping("/getSarStandardsInfoPage") 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; +// } /*** From 99321d38de7f75eb56f252f5e1d8e745f3ab1ba3 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 30 Jul 2021 09:57:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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..c703d089 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); /** * 删除权限 From f9ee8ca41c20bd295b73902aa926f635c2619794 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 30 Jul 2021 13:43:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=20bug=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?=E5=92=8C=20=E8=A7=92=E8=89=B2=E6=96=B0=E5=A2=9E=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=88=9D=E5=A7=8B=E6=9D=83=E9=99=90bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TsResourceController.java | 7 +++++++ .../sarResource/service/ITsResourceService.java | 2 ++ .../service/impl/TsResourceServiceImpl.java | 13 +++++++++++++ .../slrs/sarRole/controller/TsRoleController.java | 2 ++ .../java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java | 2 +- .../sarRole/service/impl/TsRoleServiceImpl.java | 8 ++++++++ 6 files changed, 33 insertions(+), 1 deletion(-) 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(); } From 343913c799d3f441621a4a323eaf48efb05ef67e Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 30 Jul 2021 15:20:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=85=A5=E5=BA=93=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index e3445661..4bed6d78 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -3,7 +3,7 @@ # 数据库配置 #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver -spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false #spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root @@ -14,10 +14,10 @@ spring.application.name=FotonLAWSSystem application.code=20200101 application.center=1 #============================================== -#Eruept -eureka.client.allow-redirects=true -eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ +##Eruept +#eureka.client.allow-redirects=true +#eureka.client.register-with-eureka=true +#eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ #============================================== # 邮箱配置1