From b0b1e641a31a0494262187f97034807fc53515dd Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 28 Oct 2024 15:49:39 +0800
Subject: [PATCH] Merge branch 'gzdyh_test' into gzdyh_grid
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/CustClient.java | 77 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 28 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/CustClient.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/CustClient.java
index 4bc8525..738d245 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/CustClient.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/client/api/CustClient.java
@@ -1,8 +1,11 @@
package cn.huge.module.client.api;
import cn.huge.base.common.bo.ReturnBO;
+import cn.huge.module.mediate.dto.WechatBindCaseDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
/**
@@ -18,57 +21,75 @@
/**
* 内部用户-获取登录用户
- * @url {ctx}/api/v1/ctUser/clientGetUser?userId=
+ * @url {ctx}/api/client/ctUser/clientGetUser?userId=
* @param userId 登录用户编号
* @return ReturnBO
*/
- @GetMapping("/api/v1/ctUser/clientGetUser")
+ @GetMapping("/api/client/ctUser/clientGetUser")
ReturnBO clientGetUser(@RequestParam("userId") String userId);
/**
- * 内部用户-获取登录用户
- * @url {ctx}/api/v1/ctUser/clientGetUserAll?userId=
+ * 内部用户-获取登录用户-所有信息
+ * @url {ctx}/api/client/ctUser/clientGetUserAll?userId=
* @param userId 登录用户编号
* @return
*/
- @GetMapping("/api/v1/ctUser/clientGetUserAll")
+ @GetMapping("/api/client/ctUser/clientGetUserAll")
ReturnBO clientGetUserAll(@RequestParam("userId") String userId);
/**
- * 当事人-获取登录用户
- * @url {ctx}/api/v1/paUser/clientGetUserAll?userId=
+ * 当事人-获取登录用户-所有信息
+ * @url {ctx}/api/client/paUser/clientGetUserAll?userId=
* @param userId 登录用户编号
* @return ReturnBO
*/
- @GetMapping("/api/v1/paUser/clientGetUserAll")
+ @GetMapping("/api/client/paUser/clientGetUserAll")
ReturnBO paclientGetUser(@RequestParam("userId") String userId);
- /**
- * 根据组织和角色查询
- * @url {ctx}/api/v1/ctUser/listUserByUnitRole
- * @return unitId 组织编号
- * @return roleCode 角色代码
- * @return ReturnBO
- */
- @GetMapping("/api/v1/ctUser/listUserByUnitRole")
- ReturnBO listUserByUnitRole(@RequestParam(value = "unitId") String unitId, @RequestParam(value = "roleCode") String roleCode);
/**
- * 根据部门和角色查询
- * @url {ctx}/api/v1/ctUser/listUserByDeptRole
- * @return deptId 部门编号
- * @return roleCode 角色代码
+ * pc端提交案件后-获取相关当事人用户编号
+ * @url {ctx}/api/weChat/paUser/bindGetUserId
+ * @param wechatBindCaseDTO 实体对象
* @return ReturnBO
*/
- @GetMapping("/api/v1/ctUser/listUserByDeptRole")
- ReturnBO listUserByDeptRole(@RequestParam(value = "deptId") String deptId, @RequestParam(value = "roleCode") String roleCode);
+ @PostMapping("/api/wechat/paUser/bindGetUserId")
+ ReturnBO bindGetUserId(@RequestBody WechatBindCaseDTO wechatBindCaseDTO);
/**
- * 查询客户下的法院
- * @url {ctx}/api/v1/ctUnit/listCourt1
+ * 根据id查询组织信息
+ * @url {ctx}/api/client/ctUnit/getUnitById
+ * @param unitId 组织编号
+ * @return Object
+ */
+ @GetMapping("/api/client/ctUnit/getUnitById")
+ ReturnBO getUnitById(@RequestParam("unitId") String unitId);
+
+ /**
+ * 获取上级综治中心
+ * @url {ctx}/api/client/ctUnit/getParentZzzxUnit
+ * @param unitId 组织编号
+ * @return Object
+ */
+ @GetMapping("/api/client/ctUnit/getParentZzzxUnit")
+ ReturnBO getParentZzzxUnit(@RequestParam(value = "unitId") String unitId);
+
+ /**
+ * 获取本级综治中心
+ * @url {ctx}/api/client/ctUnit/getBjZzzx
+ * @param unitId 组织编号
+ * @return Object
+ */
+ @GetMapping("/api/client/ctUnit/getBjZzzx")
+ ReturnBO getBjZzzx(@RequestParam(value = "unitId") String unitId);
+
+ /**
+ * 查询用户所在的单位信息
+ * @url {ctx}/api/client/ctUnit/getUnitByUserId
* @param userId 用户编号
- * @return ReturnBO
+ * @return Object
*/
- @GetMapping("/api/v1/ctUnit/listCourt1")
- ReturnBO listCourt1(@RequestParam(value = "userId") String userId);
+ @GetMapping("/api/client/ctUnit/getUnitByUserId")
+ ReturnBO getUnitByUserId(@RequestParam("userId") String userId);
+
}
--
Gitblit v1.8.0