Commit 31fb0769 authored by 赵啸非's avatar 赵啸非

添加资源自动刷新获取

parent e3731878
...@@ -129,8 +129,8 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re ...@@ -129,8 +129,8 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re
Arrays.stream(tempResource.getUrl().split(",")).forEach(i -> { Arrays.stream(tempResource.getUrl().split(",")).forEach(i -> {
setUrl.add(i); setUrl.add(i);
}); });
resourceEntity.setUrl(setUrl.stream().collect(Collectors.joining(","))); tempResource.setUrl(setUrl.stream().collect(Collectors.joining(",")));
this.update(resourceEntity, context); this.update(tempResource, context);
} else if (tempResourceList.size() > 1) { } else if (tempResourceList.size() > 1) {
//找到多个同名的 资源配置 //找到多个同名的 资源配置
for (ResourceEntity tempResource : tempResourceList) { for (ResourceEntity tempResource : tempResourceList) {
...@@ -149,8 +149,8 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re ...@@ -149,8 +149,8 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re
Arrays.stream(tempResource.getUrl().split(",")).forEach(i -> { Arrays.stream(tempResource.getUrl().split(",")).forEach(i -> {
setUrl.add(i); setUrl.add(i);
}); });
resourceEntity.setUrl(setUrl.stream().collect(Collectors.joining(","))); tempResource.setUrl(setUrl.stream().collect(Collectors.joining(",")));
this.update(resourceEntity, context); this.update(tempResource, context);
} }
} }
} }
......
...@@ -92,7 +92,7 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re ...@@ -92,7 +92,7 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re
public Rest<String> refreshResourceUrl(String packageName, Context context) { public Rest<String> refreshResourceUrl(String packageName, Context context) {
List<Class<?>> classList = ControllerScanUtil.getAllClassByPackageName(packageName); List<Class<?>> classList = ControllerScanUtil.getAllClassByPackageName(packageName);
//System.out.println(classList); //获取到了所有的类 //System.out.println(classList); //获取到了所有的类
List<ResourceEntity> newResourcelist = ControllerScanUtil.getAnnotationInfo(classList).stream().filter(f -> !ObjectUtils.isEmpty(f.getUrl())).collect(Collectors.toList()); List<ResourceEntity> newResourcelist = ControllerScanUtil.getAnnotationInfo(classList).stream().filter(f->!ObjectUtils.isEmpty(f.getUrl())).collect(Collectors.toList());
Map<String, List<ResourceEntity>> localResourceMap = this.find(new ResourceQuery()).stream().collect(Collectors.groupingBy(x -> x.getName())); Map<String, List<ResourceEntity>> localResourceMap = this.find(new ResourceQuery()).stream().collect(Collectors.groupingBy(x -> x.getName()));
Map<String, List<ResourceEntity>> newResourceMap = newResourcelist.stream().collect(Collectors.groupingBy(x -> x.getName())); Map<String, List<ResourceEntity>> newResourceMap = newResourcelist.stream().collect(Collectors.groupingBy(x -> x.getName()));
...@@ -129,8 +129,8 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re ...@@ -129,8 +129,8 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re
Arrays.stream(tempResource.getUrl().split(",")).forEach(i -> { Arrays.stream(tempResource.getUrl().split(",")).forEach(i -> {
setUrl.add(i); setUrl.add(i);
}); });
resourceEntity.setUrl(setUrl.stream().collect(Collectors.joining(","))); tempResource.setUrl(setUrl.stream().collect(Collectors.joining(",")));
this.update(resourceEntity, context); this.update(tempResource, context);
} else if (tempResourceList.size() > 1) { } else if (tempResourceList.size() > 1) {
//找到多个同名的 资源配置 //找到多个同名的 资源配置
for (ResourceEntity tempResource : tempResourceList) { for (ResourceEntity tempResource : tempResourceList) {
...@@ -149,8 +149,8 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re ...@@ -149,8 +149,8 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re
Arrays.stream(tempResource.getUrl().split(",")).forEach(i -> { Arrays.stream(tempResource.getUrl().split(",")).forEach(i -> {
setUrl.add(i); setUrl.add(i);
}); });
resourceEntity.setUrl(setUrl.stream().collect(Collectors.joining(","))); tempResource.setUrl(setUrl.stream().collect(Collectors.joining(",")));
this.update(resourceEntity, context); this.update(tempResource, context);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment