Browse Source

工具代码修改2

侯茂昌 1 year ago
parent
commit
7d9c0750b4

+ 0 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/BpmProcessConfigurationController.java

@@ -4,7 +4,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.system.entity.vo.NodeVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 4 - 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DataSourceController.java

@@ -1,14 +1,11 @@
 package com.ruoyi.web.controller.system;
 
-
+import com.ruoyi.common.config.Bpm.config.BpmProperties;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.DataSource;
-import com.ruoyi.common.utils.BpmUtils;
 import com.ruoyi.system.entity.TableInfo;
 import com.ruoyi.system.service.IDataSourceService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
@@ -20,6 +17,9 @@ public class DataSourceController {
     @Resource
     private IDataSourceService dataSourceService;
 
+    @Resource
+    private BpmProperties properties;
+
 
     /**
      * 切换数据源
@@ -47,12 +47,4 @@ public class DataSourceController {
     public List<TableInfo> queryTableInfo(@RequestBody Map<String, Object> map) {
         return dataSourceService.tableFieldInfo(map);
     }
-
-    @Autowired
-    BpmUtils bpmUtils;
-
-    @GetMapping("/a")
-    public String[] queryTableInfo() {
-        return  bpmUtils.getRoleKeyByUserId(1L);
-    }
 }

+ 7 - 0
ruoyi-admin/src/main/resources/application.yml

@@ -148,3 +148,10 @@ xss:
   excludes: /system/notice
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
+
+
+# 参数配置项
+parameter:
+  ip:
+    # 用户下对应的所有角色key
+    mainRolesKeyIp: http://192.168.110.83:8080/system/user/roleKeyByUserId/

+ 25 - 0
ruoyi-common/src/main/java/com/ruoyi/common/utils/Bpm/BpmUtils.java

@@ -0,0 +1,25 @@
+package com.ruoyi.common.utils.Bpm;
+import com.alibaba.fastjson2.JSONObject;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @author hmc
+ * @date 2023-11-02 15:29
+ * @Description:
+ */
+public class BpmUtils {
+
+    /**
+     * 根据用户查询角色key
+     * @param userId
+     * @return
+     */
+    public static String[]  getRoleKeyByUserId(String ip,Long userId){
+        RestTemplate restTemplate = new RestTemplate();
+        String ret = restTemplate.getForObject(ip+userId,String.class);
+        JSONObject jsonObject = JSONObject.parseObject(ret);
+        String s = (String) jsonObject.get("rolesKey");
+        String[] strings = JSONObject.parseObject(s, String[].class);
+        return  strings;
+    }
+}