From 99de75de811efed36da1d37bcf5442ae96384f6e Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sat, 21 Sep 2024 20:08:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java | 74 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 0 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 b5837d3..799ab53 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,14 +2,20 @@
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.module.grid.domain.dto.GridSysRoleDTO;
+import cn.huge.module.grid.domain.dto.GridUserRoleDTO;
import cn.huge.module.grid.domain.vo.*;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.HashMap;
+import java.util.List;
import java.util.UUID;
@Slf4j
@@ -43,6 +49,29 @@
return R.ok(gridUserVo);
}
+ public R<List<GridUserRoleDTO>> getUserRoleList(GridUserRoleVo gridUserRoleVo) {
+ String s = null;
+ HeadVo headVo = initHeadVo();
+ GridUserRoleRequestVo requestVo = new GridUserRoleRequestVo();
+ requestVo.setHeadVo(headVo);
+ requestVo.setBodyVo(gridUserRoleVo);
+ try {
+// log.info("xsdobject:{}",JSON.toJSONString(requestVo));
+ log.info("xsdurl:{}",gridUrl + "/sys/getOrgRole");
+// log.info("xsdurl:{}",testUrl + "/sys/getUserByToken");
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getOrgRole", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ log.info("xsd:{}",s);
+ } catch (Exception e) {
+ log.info("xsderror:{}",e.getLocalizedMessage());
+ throw new RuntimeException(e);
+ }
+ JSONArray data = JSONObject.parseObject(s).getJSONArray("data");
+ List<GridUserRoleDTO> gridUserRoleDTOList = data.toJavaList(GridUserRoleDTO.class);
+ return R.ok(gridUserRoleDTOList);
+ }
+
+
+
public HeadVo initHeadVo() {
HeadVo headVo = new HeadVo();
headVo.setUsername(userName);
@@ -51,4 +80,49 @@
headVo.setSource("string");
return headVo;
}
+
+ public R<GridSysRoleDTO> getSysRoleList(GridOrgVo gridOrgVo) {
+ HeadVo headVo = initHeadVo();
+ GridOrgRequestVo requestVo = new GridOrgRequestVo();
+ requestVo.setHeadVo(headVo);
+ requestVo.setBodyVo(gridOrgVo);
+ log.info("xsd:{}", JSON.toJSONString(requestVo));
+ log.info("xsd:{}", gridUrl + "/sys/getRoleList");
+ String s = null;
+ try {
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getRoleList", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ } catch (Exception e) {
+ log.info("xsderror:{}", e);
+ throw new RuntimeException(e);
+ }
+ log.info("xsd:{}", s);
+ JSONObject object = JSONObject.parseObject(s);
+ if (object.getInteger("code") != null && object.getInteger("code") == 0) {
+ GridSysRoleDTO data = object.getObject("data", GridSysRoleDTO.class);
+ return R.ok(data);
+ } else {
+ return R.fail("获取企业信息失败");
+ }
+ }
+
+ public R<List<GridRoleMenuDTO>> getRoleMenu(GridRoleMenuVo gridRoleMenuVo) {
+ String s = null;
+ HeadVo headVo = initHeadVo();
+ GridRoleMenuRequestVo requestVo = new GridRoleMenuRequestVo();
+ requestVo.setHeadVo(headVo);
+ requestVo.setBodyVo(gridRoleMenuVo);
+ try {
+// log.info("xsdobject:{}",JSON.toJSONString(requestVo));
+ log.info("xsdurl:{}",gridUrl + "/sys/getOrgRole");
+// log.info("xsdurl:{}",testUrl + "/sys/getUserByToken");
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserMenuRecur", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ log.info("xsd:{}",s);
+ } catch (Exception e) {
+ log.info("xsderror:{}",e.getLocalizedMessage());
+ throw new RuntimeException(e);
+ }
+ JSONArray data = JSONObject.parseObject(s).getJSONArray("data");
+ List<GridRoleMenuDTO> gridRoleMenuDTOList = data.toJavaList(GridRoleMenuDTO.class);
+ return R.ok(gridRoleMenuDTOList);
+ }
}
--
Gitblit v1.8.0