添加资源自动刷新获取

portal-manager/src/main/java/com/mortals/xhx/base/system/resource/service/ResourceService.java

@@ -9,7 +9,9 @@
 package com.mortals.xhx.base.system.resource.service;
 
 
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.base.system.resource.model.ResourceEntity;
 
@@ -63,4 +65,8 @@ public interface ResourceService extends ICRUDService<ResourceEntity,Long> {
      * @param userType
      */
     List<ResourceEntity> findAll(int userType);
+
+
+    Rest<String> refreshResourceUrl(String packageName, Context context);
+
 }
\ No newline at end of file

portal-manager/src/main/java/com/mortals/xhx/base/system/resource/service/impl/ResourceServiceImpl.java

@@ -8,6 +8,7 @@
 
 package com.mortals.xhx.base.system.resource.service.impl;
 
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICacheService;
@@ -19,6 +20,7 @@ import com.mortals.xhx.base.system.resource.model.ResourceEntity;
 import com.mortals.xhx.base.system.resource.model.ResourceQuery;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
 import com.mortals.xhx.common.key.RedisKey;
+import com.mortals.xhx.common.utils.ControllerScanUtil;
 import com.mortals.xhx.module.role.model.RoleAuthEntity;
 import com.mortals.xhx.module.role.model.RoleAuthQuery;
 import com.mortals.xhx.module.role.service.RoleAuthService;
@@ -26,10 +28,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.mortals.xhx.common.utils.MenuEncodeUtil.generateMenuUrlCode;
 
@@ -51,7 +51,6 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re
     @Autowired
     private RoleAuthService roleAuthService;
 
-
     @Override
     public List<ResourceEntity> findAllEnable() throws AppException {
         ResourceQuery params = new ResourceQuery();
@@ -89,6 +88,74 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl<ResourceDao, Re
         return dao.getAll(userType);
     }
 
+    @Override
+    public Rest<String> refreshResourceUrl(String packageName, Context context) {
+        List<Class<?>> classList = ControllerScanUtil.getAllClassByPackageName(packageName);
+        //System.out.println(classList); //获取到了所有的类
+        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>> newResourceMap = newResourcelist.stream().collect(Collectors.groupingBy(x -> x.getName()));
+        //更新 与新增 新加的;
+        newResourceMap.entrySet().forEach(item -> {
+            List<ResourceEntity> resourceEntities = item.getValue();
+            if (ObjectUtils.isEmpty(resourceEntities)) return;
+            if (resourceEntities.size() == 1) {
+                ResourceEntity resourceEntity = resourceEntities.get(0);
+                saveUpdateResourceEntity(context, localResourceMap, resourceEntity);
+            } else if (resourceEntities.size() > 1) {
+                //原始扫描 有多个资源列表针对一个名称的
+                for (ResourceEntity resourceEntity : resourceEntities) {
+                    saveUpdateResourceEntity(context, localResourceMap, resourceEntity);
+                }
+            }
+        });
+
+        return Rest.ok();
+    }
+
+    private void saveUpdateResourceEntity(Context context, Map<String, List<ResourceEntity>> localResourceMap, ResourceEntity resourceEntity) {
+        //查找 本地是否已经存在了
+        List<ResourceEntity> tempResourceList = localResourceMap.getOrDefault(resourceEntity.getName(), new ArrayList<>());
+        if (tempResourceList.size() == 0) {
+            //新增 resource;
+            resourceEntity.setCreateUserId(this.getContextUserId(context));
+            resourceEntity.setCreateTime(new Date());
+            this.save(resourceEntity, context);
+        } else if (tempResourceList.size() == 1) {
+            //更新
+            ResourceEntity tempResource = tempResourceList.get(0);
+            Set<String> setUrl = Arrays.stream(resourceEntity.getUrl().split(",")).collect(Collectors.toSet());
+            Arrays.stream(tempResource.getUrl().split(",")).forEach(i -> {
+                setUrl.add(i);
+            });
+            resourceEntity.setUrl(setUrl.stream().collect(Collectors.joining(",")));
+            this.update(resourceEntity, context);
+        } else if (tempResourceList.size() > 1) {
+            //找到多个同名的 资源配置
+            for (ResourceEntity tempResource : tempResourceList) {
+                //模糊匹配到路径有一个存在的
+                Set<String> setUrl = Arrays.stream(resourceEntity.getUrl().split(",")).collect(Collectors.toSet());
+                String[] splitUrl = tempResource.getUrl().split(",");
+                Boolean bool = false;
+                for (int i = 0; i < splitUrl.length; i++) {
+                    if (setUrl.contains(splitUrl[i])) {
+                        bool = true;
+                        break;
+                    }
+                }
+                if (bool) {
+                    //匹配到了，更新当前这个资源
+                    Arrays.stream(tempResource.getUrl().split(",")).forEach(i -> {
+                        setUrl.add(i);
+                    });
+                    resourceEntity.setUrl(setUrl.stream().collect(Collectors.joining(",")));
+                    this.update(resourceEntity, context);
+                }
+            }
+        }
+    }
+
 
     @Override
     protected void updateAfter(ResourceEntity entity, Context context) throws AppException {

portal-manager/src/main/java/com/mortals/xhx/base/system/resource/web/ResourceController.java

@@ -2,8 +2,11 @@ package com.mortals.xhx.base.system.resource.web;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.IBaseEnum;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.common.code.UserType;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.resource.model.ResourceEntity;
@@ -13,6 +16,7 @@ import com.mortals.xhx.common.code.SourceType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
@@ -27,37 +31,63 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("resource")
-public class ResourceController extends BaseCRUDJsonBodyMappingController<ResourceService,ResourceEntity,Long> {
-
-	public ResourceController(){
-		super.setModuleDesc("资源信息");
-	}
-
-	@Override
-	protected void init(Map<String, Object> model, Context context) {
-		Map<String, Object> statsus = new HashMap<String, Object>();
-		statsus.put("authType", AuthType.getEnumMap());
-		statsus.put("sourceType", SourceType.getEnumMap());
-		if (getCurUser().isAdmin()) {
-			statsus.put("userType",  IBaseEnum.getEnumMap(UserType.class));
-		} else {
-			statsus.put("userType", UserType.findByValue(getCurUser().getUserType()));
-		}
-		model.put(KEY_RESULT_DICT, statsus);
-	}
-
-	/**
-	 * 获取所有资源
-	 *
-	 * @return
-	 */
-	@PostMapping("allResources")
-	public String allResources(int userType) {
-		JSONObject ret = new JSONObject();
-		ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
-		ret.put(KEY_RESULT_MSG, "所有的customer以及user");
-		ret.put(KEY_RESULT_DATA, service.findAll(userType));
-		return ret.toJSONString();
-	}
-	
+public class ResourceController extends BaseCRUDJsonBodyMappingController<ResourceService, ResourceEntity, Long> {
+
+    public ResourceController() {
+        super.setModuleDesc("资源信息");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        Map<String, Object> statsus = new HashMap<String, Object>();
+        statsus.put("authType", AuthType.getEnumMap());
+        statsus.put("sourceType", SourceType.getEnumMap());
+        if (getCurUser().isAdmin()) {
+            statsus.put("userType", IBaseEnum.getEnumMap(UserType.class));
+        } else {
+            statsus.put("userType", UserType.findByValue(getCurUser().getUserType()));
+        }
+        model.put(KEY_RESULT_DICT, statsus);
+    }
+
+    /**
+     * 获取所有资源
+     *
+     * @return
+     */
+    @PostMapping("allResources")
+    public String allResources(int userType) {
+        JSONObject ret = new JSONObject();
+        ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+        ret.put(KEY_RESULT_MSG, "所有的customer以及user");
+        ret.put(KEY_RESULT_DATA, service.findAll(userType));
+        return ret.toJSONString();
+    }
+
+
+    @Override
+    protected void doListBefore(ResourceEntity query, Map<String, Object> model, Context context) throws AppException {
+
+        super.doListBefore(query, model, context);
+    }
+
+    /**
+     * 资源路径刷新
+     */
+    @PostMapping(value = "refreshUrl")
+    @UnAuth
+    public Rest<String> refreshUrl(@RequestParam(name = "packageName", defaultValue = "com.mortals.xhx") String packageName) {
+        log.info("刷新资源路径，packageName", packageName);
+        String busiDesc = this.getModuleDesc() + "资源路径刷新";
+        Rest<String> rest = Rest.ok(busiDesc + " 【成功】");
+        try {
+            this.service.refreshResourceUrl(packageName, getContext());
+            recordSysLog(request, busiDesc + " 【成功】");
+        } catch (Exception e) {
+            log.error(busiDesc, e);
+            rest = Rest.fail(super.convertException(e));
+        }
+        return rest;
+    }
+
 }
\ No newline at end of file