From 1be40c8a6695dfe8623687604d7a90a9eb7ccd70 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 14 Oct 2024 17:42:03 +0800
Subject: [PATCH] Merge branch 'feature/gzdyh_20241011_gridaccount' into gzdyh_test
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
index 799ab53..23e0946 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
@@ -2,11 +2,13 @@
import cn.huge.base.common.bo.R;
import cn.huge.base.common.utils.HttpClientUtils;
-import cn.huge.module.grid.domain.dto.GridOrgDTO;
-import cn.huge.module.grid.domain.dto.GridRoleMenuDTO;
+import cn.huge.base.common.utils.SpringContextUtil;
import cn.huge.module.grid.domain.dto.GridSysRoleDTO;
-import cn.huge.module.grid.domain.dto.GridUserRoleDTO;
import cn.huge.module.grid.domain.vo.*;
+import cn.huge.module.sys.dto.GridRoleMenuDTO;
+import cn.huge.module.sys.dto.GridUserRoleDTO;
+import cn.huge.module.sys.vo.GridRoleMenuVo;
+import cn.huge.module.sys.vo.GridUserRoleVo;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -37,9 +39,14 @@
requestVo.setBodyVo(gridTokenVo);
try {
// log.info("xsdobject:{}",JSON.toJSONString(requestVo));
- log.info("xsdurl:{}",gridUrl + "/sys/getUserByToken");
-// log.info("xsdurl:{}",testUrl + "/sys/getUserByToken");
- s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserByToken", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ // 开发环境
+ if (SpringContextUtil.checkDev()) {
+ log.info("xsdurl:{}",testUrl + "/sys/getUserByToken");
+ s = HttpClientUtils.httpPostRaw(testUrl + "/sys/getUserByToken", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ }else {
+ log.info("xsdurl:{}",gridUrl + "/sys/getUserByToken");
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserByToken", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ }
log.info("xsd:{}",s);
} catch (Exception e) {
log.info("xsderror:{}",e.getLocalizedMessage());
@@ -113,7 +120,7 @@
requestVo.setBodyVo(gridRoleMenuVo);
try {
// log.info("xsdobject:{}",JSON.toJSONString(requestVo));
- log.info("xsdurl:{}",gridUrl + "/sys/getOrgRole");
+ log.info("xsdurl:{}",gridUrl + "/sys/getUserMenuRecur");
// log.info("xsdurl:{}",testUrl + "/sys/getUserByToken");
s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserMenuRecur", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
log.info("xsd:{}",s);
@@ -125,4 +132,18 @@
List<GridRoleMenuDTO> gridRoleMenuDTOList = data.toJavaList(GridRoleMenuDTO.class);
return R.ok(gridRoleMenuDTOList);
}
+
+ public R<String> initNewUsers(GridUserRoleVo gridUserRoleVo) {
+ //根据用户id获取用户信息
+
+ //拿到用户机构信息
+
+ //拿到用户角色菜单权限信息
+
+ //如果全部菜单权限，分配管理员角色;如果部分菜单权限，分配纠纷化解员角色
+
+
+ //初始化完成用户信息，返回给前端登录
+ return R.fail();
+ }
}
--
Gitblit v1.8.0