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/domain/vo/GridOrgVo.java | 19 ++ dyh-service/dyh-sys/src/main/resources/config/application-prod.yml | 3 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridOrgInfoController.java | 34 ++++ dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridOrgDTO.java | 68 ++++++++ dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRoleVo.java | 8 + dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridUserRoleDTO.java | 36 ++++ dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridRoleMenuRequestVo.java | 10 + dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridOrgService.java | 62 +++++++ dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridRoleMenuVo.java | 16 ++ dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgRequestVo.java | 9 + dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRoleRequestVo.java | 9 + dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java | 74 +++++++++ dyh-service/dyh-sys/src/main/resources/config/application-test.yml | 3 dyh-service/dyh-sys/src/main/resources/config/application-dev.yml | 6 dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridSysRoleDTO.java | 52 ++++++ dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java | 23 ++ dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridRoleMenuDTO.java | 37 ++++ 17 files changed, 464 insertions(+), 5 deletions(-) diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridOrgInfoController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridOrgInfoController.java new file mode 100644 index 0000000..270d775 --- /dev/null +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridOrgInfoController.java @@ -0,0 +1,34 @@ +package cn.huge.module.grid.controller; + +import cn.huge.base.common.bo.R; +import cn.huge.module.grid.domain.dto.GridOrgDTO; +import cn.huge.module.grid.domain.vo.GridOrgVo; +import cn.huge.module.grid.domain.vo.GridTokenVo; +import cn.huge.module.grid.domain.vo.GridUserVo; +import cn.huge.module.grid.service.GridOrgService; +import cn.huge.module.grid.service.GridUserService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Slf4j +@RestController +@RequestMapping("/api/thrid/grid/org") +public class GridOrgInfoController { + @Resource + private GridOrgService gridOrgService; + + /** + * 获取所有机构信息 + * @param gridOrgVo + * @return + */ + @PostMapping("/get-orglist") + public R<GridOrgDTO> getOrgList(@RequestBody GridOrgVo gridOrgVo) { + return gridOrgService.getOrgList(gridOrgVo); + } +} diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java index 20ad3d8..1b0ae7d 100644 --- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java @@ -2,9 +2,10 @@ import cn.huge.base.common.bo.R; import cn.huge.base.common.utils.ReturnSucUtils; -import cn.huge.module.grid.domain.vo.GridTokenVo; -import cn.huge.module.grid.domain.vo.GridUserRequestVo; -import cn.huge.module.grid.domain.vo.GridUserVo; +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 cn.huge.module.grid.service.GridUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.PostMapping; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; @Slf4j @RestController @@ -31,4 +33,19 @@ public R<GridUserVo> getUserInfo(@RequestBody GridTokenVo gridTokenVo) { return gridUserService.getUserInfo(gridTokenVo); } + + @PostMapping("/get-user-role") + public R<List<GridUserRoleDTO>> getUserRoleList(@RequestBody GridUserRoleVo gridUserRoleVo) { + return gridUserService.getUserRoleList(gridUserRoleVo); + } + + @PostMapping("/get-sys-role") + public R<GridSysRoleDTO> getSysRoleList(@RequestBody GridOrgVo gridOrgVo) { + return gridUserService.getSysRoleList(gridOrgVo); + } + + @PostMapping("/get-role-menu") + public R<List<GridRoleMenuDTO>> getRoleMenu(@RequestBody GridRoleMenuVo gridRoleMenuVo) { + return gridUserService.getRoleMenu(gridRoleMenuVo); + } } diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridOrgDTO.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridOrgDTO.java new file mode 100644 index 0000000..c6371e9 --- /dev/null +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridOrgDTO.java @@ -0,0 +1,68 @@ +package cn.huge.module.grid.domain.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class GridOrgDTO { + /** + * 当前页 + */ + private long current; + /** + * 当前每页条数 + */ + private long size; + /** + * 总数据数 + */ + private long total; + /** + * 总页码数 + */ + private long pages; + /** + * 数据记录 + */ + private List<SySOrgDTO> records; + + @Data + public static class SySOrgDTO { + private String id; + /** + * 机构名称 + */ + private String name; + /** + * 统一社会信用代码 + */ + private String code; + /** + * 机构描述 + */ + private String orgDesc; + /** + * 网格名称 + */ + private String gridValue; + /** + * 所属网格 + */ + private String gridCode; + + + private String type; + + private String level; + + private String grade; + + private String tenantId; + + private String tenantName; + + } + + +} diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridRoleMenuDTO.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridRoleMenuDTO.java new file mode 100644 index 0000000..59cc4f8 --- /dev/null +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridRoleMenuDTO.java @@ -0,0 +1,37 @@ +package cn.huge.module.grid.domain.dto; + +import lombok.Data; + +@Data +public class GridRoleMenuDTO { + /** + * id + */ + private String id; + /** + * 菜单编码 + */ + private String code; + /** + * 名称 + */ + private String name; + /** + * 地址 + */ + private String url; + /** + * 图标 + */ + private String icon; + /** + * 是否叶子 0否 1是 + */ + private String isLeaf; + /** + * 父菜单id + */ + private String parentId; + private String orderBy; + +} diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridSysRoleDTO.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridSysRoleDTO.java new file mode 100644 index 0000000..3942a88 --- /dev/null +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridSysRoleDTO.java @@ -0,0 +1,52 @@ +package cn.huge.module.grid.domain.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class GridSysRoleDTO { + + /** + * 当前页 + */ + private long current; + /** + * 当前每页条数 + */ + private long size; + /** + * 总数据数 + */ + private long total; + /** + * 总页码数 + */ + private long pages; + /** + * 数据记录 + */ + private List<SySRoleDTO> records; + + @Data + public static class SySRoleDTO { + /** + * 角色id + */ + private String id; + + /** + * 角色编码 + */ + private String code; + /** + * 角色名称 + */ + private String name; + + private String sysPlatformCode; + + } + + +} diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridUserRoleDTO.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridUserRoleDTO.java new file mode 100644 index 0000000..5e6cec9 --- /dev/null +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/GridUserRoleDTO.java @@ -0,0 +1,36 @@ +package cn.huge.module.grid.domain.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class GridUserRoleDTO { + + private String id; + /** + * 机构名称 + */ + private String orgName; + /** + * 机构id + */ + private String orgId ; + /** + * 机构编码 + */ + private String orgCode; + /** + * 角色id + */ + private String roleId; + /** + * 角色编码 + */ + private String roleCode; + /** + * 角色名称 + */ + private String roleName; + +} diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgRequestVo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgRequestVo.java new file mode 100644 index 0000000..23a0570 --- /dev/null +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgRequestVo.java @@ -0,0 +1,9 @@ +package cn.huge.module.grid.domain.vo; + +import lombok.Data; + +@Data +public class GridOrgRequestVo { + private HeadVo headVo; + private GridOrgVo bodyVo; +} diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgVo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgVo.java new file mode 100644 index 0000000..4c48333 --- /dev/null +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgVo.java @@ -0,0 +1,19 @@ +package cn.huge.module.grid.domain.vo; + +import lombok.Data; + +@Data +public class GridOrgVo { + private String gridCode; + /** + * 机构编码 + */ + private String code; + /** + * name + */ + private String name; + private long current; + private long size; + private boolean needCount; +} diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridRoleMenuRequestVo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridRoleMenuRequestVo.java new file mode 100644 index 0000000..fc0d45d --- /dev/null +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridRoleMenuRequestVo.java @@ -0,0 +1,10 @@ +package cn.huge.module.grid.domain.vo; + +import lombok.Data; + +@Data +public class GridRoleMenuRequestVo { + private HeadVo headVo; + private GridRoleMenuVo bodyVo; + +} diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridRoleMenuVo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridRoleMenuVo.java new file mode 100644 index 0000000..f014601 --- /dev/null +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridRoleMenuVo.java @@ -0,0 +1,16 @@ +package cn.huge.module.grid.domain.vo; + +import lombok.Data; + +@Data +public class GridRoleMenuVo { + /** + * 系统编码 + */ + private String menuSys; + /** + * 角色Id + */ + private String orgRoleId; + +} diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRoleRequestVo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRoleRequestVo.java new file mode 100644 index 0000000..72d4656 --- /dev/null +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRoleRequestVo.java @@ -0,0 +1,9 @@ +package cn.huge.module.grid.domain.vo; + +import lombok.Data; + +@Data +public class GridUserRoleRequestVo { + private HeadVo headVo; + private GridUserRoleVo bodyVo; +} diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRoleVo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRoleVo.java new file mode 100644 index 0000000..98f4bbe --- /dev/null +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRoleVo.java @@ -0,0 +1,8 @@ +package cn.huge.module.grid.domain.vo; + +import lombok.Data; + +@Data +public class GridUserRoleVo { + private String userId; +} diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridOrgService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridOrgService.java new file mode 100644 index 0000000..90027e6 --- /dev/null +++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridOrgService.java @@ -0,0 +1,62 @@ +package cn.huge.module.grid.service; + +import cn.huge.base.common.bo.R; +import cn.huge.base.common.utils.AesUtils; +import cn.huge.base.common.utils.HttpClientUtils; +import cn.huge.module.grid.domain.dto.GridCompanyDTO; +import cn.huge.module.grid.domain.dto.GridOrgDTO; +import cn.huge.module.grid.domain.vo.*; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.HashMap; +import java.util.List; +import java.util.UUID; + +@Slf4j +@Service +public class GridOrgService { + @Value("${grid.url:http://219.137.166.84:8061}") + private String gridUrl; + @Value("${grid.username:mtxt0011}") + private String userName; + @Value("${grid.password}") + private String passWord; + + public HeadVo initHeadVo() { + HeadVo headVo = new HeadVo(); + headVo.setUsername(userName); + headVo.setPassword(passWord); + headVo.setRequestId(UUID.randomUUID().toString()); + headVo.setSource("string"); + return headVo; + } + + public R<GridOrgDTO> getOrgList(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/getOrgList"); + String s = null; + try { + s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getOrgList", 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) { + GridOrgDTO data = object.getObject("data", GridOrgDTO.class); + return R.ok(data); + } else { + return R.fail("获取企业信息失败"); + } + } +} 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); + } } diff --git a/dyh-service/dyh-sys/src/main/resources/config/application-dev.yml b/dyh-service/dyh-sys/src/main/resources/config/application-dev.yml index 8060a9d..0ad76e1 100644 --- a/dyh-service/dyh-sys/src/main/resources/config/application-dev.yml +++ b/dyh-service/dyh-sys/src/main/resources/config/application-dev.yml @@ -114,3 +114,9 @@ appid: 5c7b00be api_secret: MGM5Mjg2ODQzYWZmNGE2YjlhOGZlMTJj api_key: 9e0a80ed995daf5b194f06ca336080c1 + +grid: + url: http://219.137.166.84:8061 + username: mtxt001 + password: aek8CdcaM + syscode: sub-mtxt \ No newline at end of file diff --git a/dyh-service/dyh-sys/src/main/resources/config/application-prod.yml b/dyh-service/dyh-sys/src/main/resources/config/application-prod.yml index 0ed851e..0a526c8 100644 --- a/dyh-service/dyh-sys/src/main/resources/config/application-prod.yml +++ b/dyh-service/dyh-sys/src/main/resources/config/application-prod.yml @@ -117,4 +117,5 @@ grid: url: http://119.32.29.158:8061 username: mtxt001 - password: kd*cCoAb \ No newline at end of file + password: kd*cCoAb + syscode: sub-mtxt \ No newline at end of file diff --git a/dyh-service/dyh-sys/src/main/resources/config/application-test.yml b/dyh-service/dyh-sys/src/main/resources/config/application-test.yml index 85f74e1..e4b18d2 100644 --- a/dyh-service/dyh-sys/src/main/resources/config/application-test.yml +++ b/dyh-service/dyh-sys/src/main/resources/config/application-test.yml @@ -117,4 +117,5 @@ grid: url: http://219.137.166.84:8061 username: mtxt001 - password: aek8CdcaM \ No newline at end of file + password: aek8CdcaM + syscode: sub-mtxt \ No newline at end of file -- Gitblit v1.8.0